mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SPV for OpenGL: Issue #229: don't allow gl_VertexIndex or gl_InstanceIndex under -G.

Browse Source
This commit is contained in:
John Kessenich 2016-04-12 18:35:12 -06:00
parent d99524197f
commit 6f29a1bb3b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glslang/MachineIndependent/Initialize.cpp
View File

@ -1708,7 +1708,7 @@ void TBuiltIns::initialize(int version, EProfile profile, int spv, int vulkan)
stageBuiltins[EShLangVertex].append( stageBuiltins[EShLangVertex].append(
"int gl_InstanceID;" // needs qualifier fixed later "int gl_InstanceID;" // needs qualifier fixed later
); );
if (spv > 0 && version >= 140) if (vulkan > 0 && version >= 140)
stageBuiltins[EShLangVertex].append( stageBuiltins[EShLangVertex].append(
"in int gl_VertexIndex;" "in int gl_VertexIndex;"
"in int gl_InstanceIndex;" "in int gl_InstanceIndex;"
@ -1733,7 +1733,7 @@ void TBuiltIns::initialize(int version, EProfile profile, int spv, int vulkan)
"in highp int gl_VertexID;" // needs qualifier fixed later "in highp int gl_VertexID;" // needs qualifier fixed later
"in highp int gl_InstanceID;" // needs qualifier fixed later "in highp int gl_InstanceID;" // needs qualifier fixed later
); );
if (spv > 0) if (vulkan > 0)
stageBuiltins[EShLangVertex].append( stageBuiltins[EShLangVertex].append(
"in highp int gl_VertexIndex;" "in highp int gl_VertexIndex;"
"in highp int gl_InstanceIndex;" "in highp int gl_InstanceIndex;"