commit d6be6da031f7691ae27a9b9fbbeca982df02404d
author John Kessenich <cepheus@frii.com> Thu Aug 17 23:49:39 2017 -0600
committer John Kessenich <cepheus@frii.com> Thu Aug 17 23:49:39 2017 -0600
tree 69a671fe8b497ebf550ce7fbf311303945a83b99
parent 03e63fa8057dd2a10817a69d72899603f57e91ac

SPV: Fix #1016: Don't allow non-GLSL-extension protected Layer and ViewportIndex members.

SPIRV/GlslangToSpv.cpp

diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 1661d5b..4833cd7 100755
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -2465,6 +2465,10 @@
     if (member.getFieldName() == "gl_ViewportMaskPerViewNV" &&
         extensions.find("GL_NVX_multiview_per_view_attributes") == extensions.end())
         return true;
+    if ((member.getFieldName() == "gl_ViewportIndex" || member.getFieldName() == "gl_Layer") &&
+        extensions.find(glslang::E_GL_ARB_shader_viewport_layer_array) == extensions.end() &&
+        extensions.find(glslang::E_GL_NV_viewport_array2) == extensions.end())
+        return true;
 
     return false;
 };