commit 22f7aafb44b7fbb817fe0ebca43fb39df3723781
author Bryan Bernhart <bryan.bernhart@intel.com> Thu Aug 23 14:13:51 2018 -0700
committer Commit Bot <commit-bot@chromium.org> Mon Aug 27 17:20:16 2018 +0000
tree f8c231cd30d0a7592af6e059b53a5b78614fdf45
parent c14ab2a7aaf244ec6b96b61f91d5251accf54605

Add webgl checks in GetActiveUniformsiv.

Add validation that disallows GL_UNIFORM_NAME_LENGTH from being used.

BUG=angleproject:1523
TEST=angle_end2end_tests

Change-Id: Id70e25ab79fd93ae4eb8b8343819458a4a0e4a71
Reviewed-on: https://chromium-review.googlesource.com/1187511
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Bryan Bernhart <bryan.bernhart@intel.com>
Commit-Queue: Bryan Bernhart <bryan.bernhart@intel.com>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/libANGLE/validationES3.cpp

diff --git a/src/libANGLE/validationES3.cpp b/src/libANGLE/validationES3.cpp
index 0a0fd1d..cc80c13 100644
--- a/src/libANGLE/validationES3.cpp
+++ b/src/libANGLE/validationES3.cpp
@@ -3347,7 +3347,14 @@
     {
         case GL_UNIFORM_TYPE:
         case GL_UNIFORM_SIZE:
+            break;
         case GL_UNIFORM_NAME_LENGTH:
+            if (context->getExtensions().webglCompatibility)
+            {
+                ANGLE_VALIDATION_ERR(context, InvalidEnum(), EnumNotSupported);
+                return false;
+            }
+            break;
         case GL_UNIFORM_BLOCK_INDEX:
         case GL_UNIFORM_OFFSET:
         case GL_UNIFORM_ARRAY_STRIDE: