glslang: Allow GL_ARB_explicit_attrib_location to add "layout" keyword pre version 140.

git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@30647 e7fa87d3-cd2b-0410-9028-fcbf551c1848

glslang: Allow GL_ARB_explicit_attrib_location to add "layout" keyword pre version 140.
87a5e2a8 · John Kessenich · 837c6380 · 87a5e2a8
Commit 87a5e2a8 authored Apr 09, 2015 by John Kessenich
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

Scan.cpp glslang/MachineIndependent/Scan.cpp +6 -2

No files found.
--- a/glslang/MachineIndependent/Scan.cpp
+++ b/glslang/MachineIndependent/Scan.cpp
@@ -695,12 +695,16 @@ int TScanContext::tokenizeIdentifier()
        return keyword;

    case LAYOUT:
+    {
+        const int numLayoutExts = 2;
+        const char* layoutExts[numLayoutExts] = { GL_ARB_shading_language_420pack,
+                                                  GL_ARB_explicit_attrib_location };
        if ((parseContext.profile == EEsProfile && parseContext.version < 300) ||
            (parseContext.profile != EEsProfile && parseContext.version < 140 &&
-            ! parseContext.extensionsTurnedOn(1, &GL_ARB_shading_language_420pack)))
+            ! parseContext.extensionsTurnedOn(numLayoutExts, layoutExts)))
            return identifierOrType();
        return keyword;
-
+    }
    case SHARED:
        if ((parseContext.profile == EEsProfile && parseContext.version < 300) ||
            (parseContext.profile != EEsProfile && parseContext.version < 140))