glslang front-end: Support relaxed error checking for bug 13724 "...initializer…

glslang front-end: Support relaxed error checking for bug 13724 "...initializer must be a constant expression..." because that change breaks existing shipping applications. (Normal validation for portability testing still gives an error.) git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@31475 e7fa87d3-cd2b-0410-9028-fcbf551c1848

glslang front-end: Support relaxed error checking for bug 13724 "...initializer…
4751ce3f · John Kessenich · fae38ee2 · 4751ce3f
Commit 4751ce3f authored Jun 11, 2015 by John Kessenich
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

ParseHelper.cpp glslang/MachineIndependent/ParseHelper.cpp +4 -1

No files found.
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -4160,7 +4160,10 @@ TIntermNode* TParseContext::executeInitializer(TSourceLoc loc, TIntermTyped* ini
        // qualifier any initializer must be a constant expression."
        if (symbolTable.atGlobalLevel() && initializer->getType().getQualifier().storage != EvqConst) {
            const char* initFeature = "non-constant global initializer";
-            requireProfile(loc, ~EEsProfile, initFeature);
+            if (messages & EShMsgRelaxedErrors)
+                warn(loc, "not allowed in this version", initFeature, "");
+            else
+                requireProfile(loc, ~EEsProfile, initFeature);
        }
    }