From 87a5e2a84b08421937bbfb051fa60c16bade65a1 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Thu, 9 Apr 2015 21:04:44 +0000 Subject: [PATCH] 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/MachineIndependent/Scan.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/glslang/MachineIndependent/Scan.cpp b/glslang/MachineIndependent/Scan.cpp index cb01d089..a77d3928 100644 --- 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))