Change GLSL->SPIR-V mapping of notEqual to OpFUnordNotEqual not OpFOrdNotEqual
authorPiers Daniell <pdaniell@nvidia.com>
Tue, 15 Jun 2021 03:33:35 +0000 (21:33 -0600)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Tue, 29 Jun 2021 06:59:43 +0000 (06:59 +0000)
The glslang compiler was changed in https://github.com/KhronosGroup/glslang/pull/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

external/openglcts/modules/gl/gl4cGlSpirvTests.cpp

index 83bfad4..678bb72 100644 (file)
@@ -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");