Add missing builtins for GL_EXT_explicit_arithmetic_types for es

100457e0 · Greg Fischer · b3859343 · 100457e0 · 100457e0
Commit 100457e0 authored Apr 16, 2021 by Greg Fischer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Initialize.cpp glslang/MachineIndependent/Initialize.cpp +0 -0

ParseHelper.cpp glslang/MachineIndependent/ParseHelper.cpp +5 -2

No files found.
--- a/glslang/MachineIndependent/Initialize.cpp
+++ b/glslang/MachineIndependent/Initialize.cpp
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -6424,8 +6424,11 @@ const TFunction* TParseContext::findFunction(const TSourceLoc& loc, const TFunct
                                extensionTurnedOn(E_GL_EXT_shader_explicit_arithmetic_types_float64);
    if (isEsProfile())
-        function = (extensionTurnedOn(E_GL_EXT_shader_implicit_conversions) && version >= 310) ?
+        function = (explicitTypesEnabled && version >= 310)
-                    findFunction120(loc, call, builtIn) : findFunctionExact(loc, call, builtIn);
+                   ? findFunctionExplicitTypes(loc, call, builtIn)
+                   : ((extensionTurnedOn(E_GL_EXT_shader_implicit_conversions) && version >= 310)
+                      ? findFunction120(loc, call, builtIn)
+                      : findFunctionExact(loc, call, builtIn));
    else if (version < 120)
        function = findFunctionExact(loc, call, builtIn);
    else if (version < 400)