Skip to content

G
glslang
Unverified Commit ed948c8e by Greg Fischer Committed by GitHub
Options

Merge pull request #2612 from greg-lunarg/explicit0

Fix builtins for GL_EXT_shader_explicit_arithmetic_types for es
parents b3859343 100457e0
Showing with 5 additions and 2 deletions
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) ?
findFunction120(loc, call, builtIn) : findFunctionExact(loc, call, builtIn);
function = (explicitTypesEnabled && version >= 310)
? 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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment