Add default compiler options to WebGL shaders.

src/libANGLE/Shader.cpp

@@ -20,6 +20,7 @@
 #include "libANGLE/renderer/GLImplFactory.h"
 #include "libANGLE/renderer/ShaderImpl.h"
 #include "libANGLE/ResourceManager.h"
+#include "libANGLE/Context.h"
 
 namespace gl
 {
@@ -227,7 +228,7 @@ void Shader::getTranslatedSourceWithDebugInfo(GLsizei bufSize, GLsizei *length,
     getSourceImpl(debugInfo, bufSize, length, buffer);
 }
 
-void Shader::compile(Compiler *compiler)
+void Shader::compile(const Context *context)
 {
     mState.mTranslatedSource.clear();
     mInfoLog.clear();
@@ -238,6 +239,7 @@ void Shader::compile(Compiler *compiler)
     mState.mActiveAttributes.clear();
     mState.mActiveOutputVariables.clear();
 
+    Compiler *compiler = context->getCompiler();
     ShHandle compilerHandle = compiler->getCompilerHandle(mState.mShaderType);
 
     std::stringstream sourceStream;
@@ -247,6 +249,14 @@ void Shader::compile(Compiler *compiler)
         mImplementation->prepareSourceAndReturnOptions(&sourceStream, &sourcePath);
     ShCompileOptions compileOptions = (SH_OBJECT_CODE | SH_VARIABLES | additionalOptions);
 
+    // Add default options to WebGL shaders to prevent unexpected behavior during compilation.
+    if (context->getExtensions().webglCompatibility)
+    {
+        compileOptions |= SH_LIMIT_CALL_STACK_DEPTH;
+        compileOptions |= SH_LIMIT_EXPRESSION_COMPLEXITY;
+        compileOptions |= SH_ENFORCE_PACKING_RESTRICTIONS;
+    }
+
     // Some targets (eg D3D11 Feature Level 9_3 and below) do not support non-constant loop indexes
     // in fragment shaders. Shader compilation will fail. To provide a better error message we can
     // instruct the compiler to pre-validate.

src/libANGLE/Shader.h

@@ -36,6 +36,7 @@ class Compiler;
 class ContextState;
 struct Limitations;
 class ResourceManager;
+class Context;
 
 class ShaderState final : angle::NonCopyable
 {
@@ -110,7 +111,7 @@ class Shader final : angle::NonCopyable, public LabeledObject
     void getTranslatedSource(GLsizei bufSize, GLsizei *length, char *buffer) const;
     void getTranslatedSourceWithDebugInfo(GLsizei bufSize, GLsizei *length, char *buffer) const;
 
-    void compile(Compiler *compiler);
+    void compile(const Context *context);
     bool isCompiled() const { return mCompiled; }
 
     void addRef();

src/libGLESv2/entry_points_gles_2_0.cpp

@@ -485,7 +485,7 @@ void GL_APIENTRY CompileShader(GLuint shader)
         {
             return;
         }
-        shaderObject->compile(context->getCompiler());
+        shaderObject->compile(context);
     }
 }