Skip to content

Commit

Permalink
Change GLSL->SPIR-V mapping of notEqual to OpFUnordNotEqual not OpFOr…
Browse files Browse the repository at this point in the history
…dNotEqual

The glslang compiler was changed in KhronosGroup/glslang#2260
to generate OpFUnordNotEqual rather than OpFOrdNotEqual for a!=b.

Without this change the
KHR-GL46.gl_spirv.spirv_glsl_to_spirv_builtin_functions_test
test generates an InternalError because it can't find the
expected mapping.

Affects:

KHR-GL46.gl_spirv.spirv_glsl_to_spirv_builtin_functions_test

Change-Id: Ieda8dc02c0be90a7985b15ca28dbefb1a45cc7c1
Components: OpenGL
  • Loading branch information
pdaniell-nv authored and alegal-arm committed Jun 29, 2021
1 parent 7d65d88 commit 4705f24
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion external/openglcts/modules/gl/gl4cGlSpirvTests.cpp
Expand Up @@ -1821,7 +1821,7 @@ void SpirvGlslToSpirVBuiltInFunctionsTest::initMappings()
m_mappings["greaterThan"].push_back("OpFOrdGreaterThan");
m_mappings["greaterThanEqual"].push_back("OpFOrdGreaterThanEqual");
m_mappings["equal"].push_back("OpFOrdEqual");
m_mappings["notEqual"].push_back("OpFOrdNotEqual");
m_mappings["notEqual"].push_back("OpFUnordNotEqual");
m_mappings["any"].push_back("OpAny");
m_mappings["all"].push_back("OpAll");
m_mappings["not"].push_back("OpLogicalNot");
Expand Down

0 comments on commit 4705f24

Please sign in to comment.