Forbid shared and packed layouts in WebGL

WebGL 2.0 spec section 5.25 specifies this. BUG=angleproject:1542 TEST=WebGL 2 conformance tests Change-Id: Ic5758bc0e767a8e6dd032e42c0a69bcae06381c4 Reviewed-on: https://chromium-review.googlesource.com/399682Reviewed-by: Zhenyao Mo <zmo@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

Forbid shared and packed layouts in WebGL
f0173153 · Olli Etuaho · Commit Bot · 250ae902 · f0173153 · f0173153
Commit f0173153 authored Oct 17, 2016 by Olli Etuaho Committed by Commit Bot Oct 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

ParseContext.cpp src/compiler/translator/ParseContext.cpp +8 -0

ParseContext.h src/compiler/translator/ParseContext.h +1 -1

No files found.
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -2865,10 +2865,18 @@ TLayoutQualifier TParseContext::parseLayoutQualifier(const TString &qualifierTyp

    if (qualifierType == "shared")
    {
+        if (IsWebGLBasedSpec(mShaderSpec))
+        {
+            error(qualifierTypeLine, "Only std140 layout is allowed in WebGL", "shared");
+        }
        qualifier.blockStorage = EbsShared;
    }
    else if (qualifierType == "packed")
    {
+        if (IsWebGLBasedSpec(mShaderSpec))
+        {
+            error(qualifierTypeLine, "Only std140 layout is allowed in WebGL", "packed");
+        }
        qualifier.blockStorage = EbsPacked;
    }
    else if (qualifierType == "std140")

--- a/src/compiler/translator/ParseContext.h
+++ b/src/compiler/translator/ParseContext.h
@@ -53,7 +53,7 @@ class TParseContext : angle::NonCopyable
          mChecksPrecisionErrors(checksPrecErrors),
          mFragmentPrecisionHighOnESSL1(false),
          mDefaultMatrixPacking(EmpColumnMajor),
-          mDefaultBlockStorage(EbsShared),
+          mDefaultBlockStorage(IsWebGLBasedSpec(spec) ? EbsStd140 : EbsShared),
          mDiagnostics(is),
          mDirectiveHandler(ext,
                            mDiagnostics,