commit f01731530e7f754e5ebaf32d00f3e23b62376424
author Olli Etuaho <oetuaho@nvidia.com> Mon Oct 17 09:05:03 2016 -0700
committer Commit Bot <commit-bot@chromium.org> Sat Oct 22 00:09:39 2016 +0000
tree dccf77cb2c0b3a1515ab692f4d13b5fb088b7619
parent 250ae90203a31b53d78655e3295b833d56a8accf

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/399682
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/ParseContext.cpp

diff --git a/src/compiler/translator/ParseContext.cpp b/src/compiler/translator/ParseContext.cpp
index 79b2b06..70c0c27 100644
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -2865,10 +2865,18 @@
 
     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")