From 6f29a1bb3b276bf9586e04ea69dc0b629a6c7689 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Tue, 12 Apr 2016 18:35:12 -0600 Subject: [PATCH] SPV for OpenGL: Issue #229: don't allow gl_VertexIndex or gl_InstanceIndex under -G. --- glslang/MachineIndependent/Initialize.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glslang/MachineIndependent/Initialize.cpp b/glslang/MachineIndependent/Initialize.cpp index 2e094f02..446c51c9 100644 --- a/glslang/MachineIndependent/Initialize.cpp +++ b/glslang/MachineIndependent/Initialize.cpp @@ -1708,7 +1708,7 @@ void TBuiltIns::initialize(int version, EProfile profile, int spv, int vulkan) stageBuiltins[EShLangVertex].append( "int gl_InstanceID;" // needs qualifier fixed later ); - if (spv > 0 && version >= 140) + if (vulkan > 0 && version >= 140) stageBuiltins[EShLangVertex].append( "in int gl_VertexIndex;" "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_InstanceID;" // needs qualifier fixed later ); - if (spv > 0) + if (vulkan > 0) stageBuiltins[EShLangVertex].append( "in highp int gl_VertexIndex;" "in highp int gl_InstanceIndex;"