Translator: Validate ESSL 100 limitations during parse

Validating the shape of the for loop as specifically required by WebGL
(per ESSL 100 spec, Appendix A) is more easily done during parse, where
the shape of the input GLSL is exactly known.

Bug: angleproject:349994211
Change-Id: I05a9b1b6915dbc1f6c74bb9159f6cc85fefc7b67
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/7022355
Reviewed-by: Yuxin Hu <[email protected]>
Commit-Queue: Shahbaz Youssefi <[email protected]>
Reviewed-by: Geoff Lang <[email protected]>

Author: ShabbyX

scripts/code_generation_hashes/ANGLE_shader_translator.json

@@ -6,11 +6,11 @@
   "src/compiler/translator/glslang.l":
     "9b7c272139d0def4b42e2fd93ae9538d",
   "src/compiler/translator/glslang.y":
-    "681b62aa1258b36ee27a1b543b40b683",
+    "b887792a6d04aa7525cf3869961b6d06",
   "src/compiler/translator/glslang_lex_autogen.cpp":
     "14c0f0593c173936c5be7f87a05a20b9",
   "src/compiler/translator/glslang_tab_autogen.cpp":
-    "17444c0966c581523495dd27c4067778",
+    "e10f1917b2cbca9fbd15170da044387d",
   "src/compiler/translator/glslang_tab_autogen.h":
     "028bdaebf359aefbcdaafae466993ebe",
   "tools/flex-bison/linux/bison.sha1":

src/compiler.gni

@@ -100,8 +100,6 @@ angle_translator_sources = [
   "src/compiler/translator/ValidateAST.h",
   "src/compiler/translator/ValidateGlobalInitializer.cpp",
   "src/compiler/translator/ValidateGlobalInitializer.h",
-  "src/compiler/translator/ValidateLimitations.cpp",
-  "src/compiler/translator/ValidateLimitations.h",
   "src/compiler/translator/ValidateOutputs.cpp",
   "src/compiler/translator/ValidateOutputs.h",
   "src/compiler/translator/ValidateSwitch.cpp",

src/compiler/translator/Compiler.cpp

@@ -26,7 +26,6 @@
 #include "compiler/translator/OutputTree.h"
 #include "compiler/translator/ParseContext.h"
 #include "compiler/translator/SizeClipCullDistance.h"
-#include "compiler/translator/ValidateLimitations.h"
 #include "compiler/translator/ValidateOutputs.h"
 #include "compiler/translator/ValidateTypeSizeLimitations.h"
 #include "compiler/translator/ValidateVaryingLocations.h"
@@ -882,12 +881,6 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root,
         }
     }
 
-    if (shouldRunLoopAndIndexingValidation(compileOptions) &&
-        !ValidateLimitations(root, mShaderType, &mSymbolTable, &mDiagnostics))
-    {
-        return false;
-    }
-
     // Fold expressions that could not be folded before validation that was done as a part of
     // parsing.
     if (!FoldExpressions(this, root, &mDiagnostics))
@@ -1036,7 +1029,6 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root,
         }
     }
 
-    // Clamping uniform array bounds needs to happen after validateLimitations pass.
     if (compileOptions.clampIndirectArrayBounds)
     {
         if (!ClampIndirectIndices(this, root, &mSymbolTable))
@@ -1233,7 +1225,6 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root,
         return false;
     }
 
-    // Built-in function emulation needs to happen after validateLimitations pass.
     GetGlobalPoolAllocator()->lock();
     initBuiltInFunctionEmulator(&mBuiltInFunctionEmulator, compileOptions);
     GetGlobalPoolAllocator()->unlock();

src/compiler/translator/DirectiveHandler.cpp

@@ -12,6 +12,7 @@
 #include "common/debug.h"
 #include "compiler/translator/Common.h"
 #include "compiler/translator/Diagnostics.h"
+#include "compiler/translator/ParseContext.h"
 
 namespace sh
 {
@@ -36,11 +37,11 @@ static TBehavior getBehavior(const std::string &str)
 
 TDirectiveHandler::TDirectiveHandler(TExtensionBehavior &extBehavior,
                                      TDiagnostics &diagnostics,
-                                     int &shaderVersion,
+                                     TParseContext &context,
                                      sh::GLenum shaderType)
     : mExtensionBehavior(extBehavior),
       mDiagnostics(diagnostics),
-      mShaderVersion(shaderVersion),
+      mContext(context),
       mShaderType(shaderType)
 {}
 
@@ -63,7 +64,7 @@ void TDirectiveHandler::handlePragma(const angle::pp::SourceLocation &loc,
 
         if (name == kInvariant && value == kAll)
         {
-            if (mShaderVersion == 300 && mShaderType == GL_FRAGMENT_SHADER)
+            if (mContext.getShaderVersion() == 300 && mShaderType == GL_FRAGMENT_SHADER)
             {
                 // ESSL 3.00.4 section 4.6.1
                 mDiagnostics.error(
@@ -151,7 +152,8 @@ void TDirectiveHandler::handleExtension(const angle::pp::SourceLocation &loc,
     }
 
     TExtensionBehavior::iterator iter = mExtensionBehavior.find(GetExtensionByName(name.c_str()));
-    if (iter != mExtensionBehavior.end() && CheckExtensionVersion(iter->first, mShaderVersion))
+    if (iter != mExtensionBehavior.end() &&
+        CheckExtensionVersion(iter->first, mContext.getShaderVersion()))
     {
         iter->second = behaviorVal;
         // OVR_multiview is implicitly enabled when OVR_multiview2 is enabled
@@ -308,7 +310,7 @@ void TDirectiveHandler::handleVersion(const angle::pp::SourceLocation &loc,
 {
     if (version == 100 || version == 300 || version == 310 || version == 320)
     {
-        mShaderVersion = version;
+        mContext.onShaderVersionDeclared(version);
 
         // Add macros for supported extensions
         for (const auto &iter : mExtensionBehavior)

src/compiler/translator/DirectiveHandler.h

@@ -17,13 +17,14 @@
 namespace sh
 {
 class TDiagnostics;
+class TParseContext;
 
 class TDirectiveHandler : public angle::pp::DirectiveHandler, angle::NonCopyable
 {
   public:
     TDirectiveHandler(TExtensionBehavior &extBehavior,
                       TDiagnostics &diagnostics,
-                      int &shaderVersion,
+                      TParseContext &context,
                       sh::GLenum shaderType);
     ~TDirectiveHandler() override;
 
@@ -50,7 +51,7 @@ class TDirectiveHandler : public angle::pp::DirectiveHandler, angle::NonCopyable
     TPragma mPragma;
     TExtensionBehavior &mExtensionBehavior;
     TDiagnostics &mDiagnostics;
-    int &mShaderVersion;
+    TParseContext &mContext;
     sh::GLenum mShaderType;
 };