commit d4ae863d01d5f448dbbba6be4ecc161971a2324f
author John Bauman <jbauman@google.com> Tue May 06 16:18:33 2014 -0400
committer Nicolas Capens <capn@google.com> Tue May 06 16:18:33 2014 -0400
tree 78d545425ab40611774463a27d0fddb95d1c491d
parent 450c32d041f88129aa97633e5f147e59931e6499

Update to June 11 2013 code drop.

This should fix the hang bug we've been seeing.

src/GLES2/compiler/ShHandle.h

diff --git a/src/GLES2/compiler/ShHandle.h b/src/GLES2/compiler/ShHandle.h
index a0105ab..8294abf 100644
--- a/src/GLES2/compiler/ShHandle.h
+++ b/src/GLES2/compiler/ShHandle.h
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved.
+// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
@@ -65,15 +65,15 @@
     bool InitBuiltInSymbolTable(const ShBuiltInResources& resources);
     // Clears the results from the previous compilation.
     void clearResults();
-    // Return true if function recursion is detected.
-    bool detectRecursion(TIntermNode* root);
+    // Return true if function recursion is detected or call depth exceeded.
+    bool validateCallDepth(TIntermNode *root, TInfoSink &infoSink);
     // Returns true if the given shader does not exceed the minimum
     // functionality mandated in GLSL 1.0 spec Appendix A.
-    bool validateLimitations(TIntermNode* root);
+    bool validateLimitations(TIntermNode *root);
     // Collect info for all attribs and uniforms.
-    void collectAttribsUniforms(TIntermNode* root);
+    void collectAttribsUniforms(TIntermNode *root);
     // Translate to object code.
-    virtual void translate(TIntermNode* root) = 0;
+    virtual void translate(TIntermNode *root) = 0;
     // Get built-in extensions with default behavior.
     const TExtensionBehavior& getExtensionBehavior() const;
 
@@ -81,6 +81,8 @@
     ShShaderType shaderType;
     ShShaderSpec shaderSpec;
 
+    unsigned int maxCallStackDepth;
+
     // Built-in symbol table for the given language, spec, and resources.
     // It is preserved from compile-to-compile.
     TSymbolTable symbolTable;