rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-27 04:54:15 +01:00
Code Issues Projects Releases Wiki Activity

[dxso] Don't emit FOrdNotEqual

Browse Source
This commit is contained in:
Philip Rebohle 2024-11-10 22:16:51 +01:00
parent 235bc22eea
commit 5463dc69d8
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/d3d9/d3d9_fixed_function.cpp
View File

@ -302,7 +302,7 @@ namespace dxvk {
case VK_COMPARE_OP_EQUAL: return spvModule.opFOrdEqual (boolType, alphaId, alphaRefId); case VK_COMPARE_OP_EQUAL: return spvModule.opFOrdEqual (boolType, alphaId, alphaRefId);
case VK_COMPARE_OP_LESS_OR_EQUAL: return spvModule.opFOrdLessThanEqual (boolType, alphaId, alphaRefId); case VK_COMPARE_OP_LESS_OR_EQUAL: return spvModule.opFOrdLessThanEqual (boolType, alphaId, alphaRefId);
case VK_COMPARE_OP_GREATER: return spvModule.opFOrdGreaterThan (boolType, alphaId, alphaRefId); case VK_COMPARE_OP_GREATER: return spvModule.opFOrdGreaterThan (boolType, alphaId, alphaRefId);
case VK_COMPARE_OP_NOT_EQUAL: return spvModule.opFOrdNotEqual (boolType, alphaId, alphaRefId); case VK_COMPARE_OP_NOT_EQUAL: return spvModule.opFUnordNotEqual (boolType, alphaId, alphaRefId);
case VK_COMPARE_OP_GREATER_OR_EQUAL: return spvModule.opFOrdGreaterThanEqual(boolType, alphaId, alphaRefId); case VK_COMPARE_OP_GREATER_OR_EQUAL: return spvModule.opFOrdGreaterThanEqual(boolType, alphaId, alphaRefId);
default: default:
case VK_COMPARE_OP_ALWAYS: return spvModule.constBool(true); case VK_COMPARE_OP_ALWAYS: return spvModule.constBool(true);

2
src/dxso/dxso_compiler.cpp
View File

@ -1286,7 +1286,7 @@ namespace dxvk {
case DxsoComparison::Equal: return m_module.opFOrdEqual (typeId, a, b); break; case DxsoComparison::Equal: return m_module.opFOrdEqual (typeId, a, b); break;
case DxsoComparison::GreaterEqual: return m_module.opFOrdGreaterThanEqual(typeId, a, b); break; case DxsoComparison::GreaterEqual: return m_module.opFOrdGreaterThanEqual(typeId, a, b); break;
case DxsoComparison::LessThan: return m_module.opFOrdLessThan (typeId, a, b); break; case DxsoComparison::LessThan: return m_module.opFOrdLessThan (typeId, a, b); break;
case DxsoComparison::NotEqual: return m_module.opFOrdNotEqual (typeId, a, b); break; case DxsoComparison::NotEqual: return m_module.opFUnordNotEqual (typeId, a, b); break;
case DxsoComparison::LessEqual: return m_module.opFOrdLessThanEqual (typeId, a, b); break; case DxsoComparison::LessEqual: return m_module.opFOrdLessThanEqual (typeId, a, b); break;
case DxsoComparison::Always: return m_module.constbReplicant(true, type.ccount); break; case DxsoComparison::Always: return m_module.constbReplicant(true, type.ccount); break;
} }

4
src/spirv/spirv_module.cpp
View File

@ -2494,13 +2494,13 @@ namespace dxvk {
} }
uint32_t SpirvModule::opFOrdNotEqual( uint32_t SpirvModule::opFUnordNotEqual(
uint32_t resultType, uint32_t resultType,
uint32_t vector1, uint32_t vector1,
uint32_t vector2) { uint32_t vector2) {
uint32_t resultId = this->allocateId(); uint32_t resultId = this->allocateId();
m_code.putIns (spv::OpFOrdNotEqual, 5); m_code.putIns (spv::OpFUnordNotEqual, 5);
m_code.putWord(resultType); m_code.putWord(resultType);
m_code.putWord(resultId); m_code.putWord(resultId);
m_code.putWord(vector1); m_code.putWord(vector1);

2
src/spirv/spirv_module.h
View File

@ -882,7 +882,7 @@ namespace dxvk {
uint32_t vector1, uint32_t vector1,
uint32_t vector2); uint32_t vector2);
uint32_t opFOrdNotEqual( uint32_t opFUnordNotEqual(
uint32_t resultType, uint32_t resultType,
uint32_t vector1, uint32_t vector1,
uint32_t vector2); uint32_t vector2);