backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[d3d9] FF: use correct vector type when dealing with tex coords

Browse Source
This commit is contained in:
Robin Kertels 2021-04-04 17:03:20 +02:00 committed by Joshie
parent 8e352d0260
commit 9d0c46b9c6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/d3d9/d3d9_fixed_function.cpp
View File

@ -1560,7 +1560,7 @@ namespace dxvk {
bool processedTexture = false; bool processedTexture = false;
auto DoBumpmapCoords = [&](uint32_t baseCoords) { auto DoBumpmapCoords = [&](uint32_t typeId, uint32_t baseCoords) {
uint32_t stage = i - 1; uint32_t stage = i - 1;
uint32_t coords = baseCoords; uint32_t coords = baseCoords;
@ -1579,7 +1579,7 @@ namespace dxvk {
uint32_t dot = m_module.opDot(m_floatType, bm, t); uint32_t dot = m_module.opDot(m_floatType, bm, t);
uint32_t result = m_module.opFAdd(m_floatType, tc_m_n, dot); uint32_t result = m_module.opFAdd(m_floatType, tc_m_n, dot);
coords = m_module.opCompositeInsert(m_vec4Type, result, coords, 1, &i); coords = m_module.opCompositeInsert(typeId, result, coords, 1, &i);
} }
return coords; return coords;
@ -1625,10 +1625,10 @@ namespace dxvk {
m_fsKey.Stages[i - 1].Contents.ColorOp == D3DTOP_BUMPENVMAPLUMINANCE)) { m_fsKey.Stages[i - 1].Contents.ColorOp == D3DTOP_BUMPENVMAPLUMINANCE)) {
if (shouldProject) { if (shouldProject) {
uint32_t projRcp = m_module.opFDiv(m_floatType, m_module.constf32(1.0), projValue); uint32_t projRcp = m_module.opFDiv(m_floatType, m_module.constf32(1.0), projValue);
texcoord = m_module.opVectorTimesScalar(m_vec4Type, texcoord, projRcp); texcoord = m_module.opVectorTimesScalar(texcoord_t, texcoord, projRcp);
} }
texcoord = DoBumpmapCoords(texcoord); texcoord = DoBumpmapCoords(texcoord_t, texcoord);
shouldProject = false; shouldProject = false;
} }