commit e0f623a40a349595c764a1770b4930111b5e24b4
author Olli Etuaho <oetuaho@nvidia.com> Fri Jul 10 11:58:30 2015 +0300
committer Olli Etuaho <oetuaho@nvidia.com> Mon Jul 13 07:58:42 2015 +0000
tree 59d3a2e3d9288d04c995426fc64476f87eedf7d0
parent 7ef89571376b9ec5a23fd7b4ca181b7146ca2c61

Check that block instance name isn't reserved

BUG=angleproject:1060
TEST=dEQP-GLES3.functional.shaders.uniform_block.invalid.*

Change-Id: I6de3aa0f714d585e7821798744530f3e51ddee7f
Reviewed-on: https://chromium-review.googlesource.com/284259
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Zhenyao Mo <zmo@chromium.org>
Tested-by: 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 50bd30c..d9806b5 100644
--- a/src/compiler/translator/ParseContext.cpp
+++ b/src/compiler/translator/ParseContext.cpp
@@ -2309,6 +2309,9 @@
     }
     else
     {
+        if (reservedErrorCheck(instanceLine, *instanceName))
+            recover();
+
         // add a symbol for this interface block
         TVariable *instanceTypeDef = new TVariable(instanceName, interfaceBlockType, false);
         instanceTypeDef->setQualifier(typeQualifier.qualifier);