Bug 1062355 - Enable SH_LIMIT_CALL_STACK_DEPTH. r=jgilbert, a=sledru
authorDan Glastonbury <dglastonbury@mozilla.com>
Mon, 08 Dec 2014 13:29:29 +1000
changeset 234193 b044a73a2d5fe9bf4178c1103270c3ba0546085a
parent 234192 8a3543e788b9eb8256c04104fdea4449e773e132
child 234194 4c097194653128aca7e6257ce65b29f1dd4381d3
push id4227
push userryanvm@gmail.com
push dateFri, 12 Dec 2014 14:01:25 +0000
treeherdermozilla-beta@b044a73a2d5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert, sledru
bugs1062355
milestone35.0
Bug 1062355 - Enable SH_LIMIT_CALL_STACK_DEPTH. r=jgilbert, a=sledru
dom/canvas/WebGLContextGL.cpp
--- a/dom/canvas/WebGLContextGL.cpp
+++ b/dom/canvas/WebGLContextGL.cpp
@@ -3138,17 +3138,18 @@ WebGLContext::CompileShader(WebGLShader 
     compiler = ShConstructCompiler(shader->ShaderType(),
                                    SH_WEBGL_SPEC,
                                    targetShaderSourceLanguage,
                                    &resources);
 
     int compileOptions = SH_VARIABLES |
                          SH_ENFORCE_PACKING_RESTRICTIONS |
                          SH_INIT_VARYINGS_WITHOUT_STATIC_USE |
-                         SH_OBJECT_CODE;
+                         SH_OBJECT_CODE |
+                         SH_LIMIT_CALL_STACK_DEPTH;
 
     if (resources.MaxExpressionComplexity > 0) {
         compileOptions |= SH_LIMIT_EXPRESSION_COMPLEXITY;
     }
 
 #ifndef XP_MACOSX
     // We want to do this everywhere, but to do this on Mac, we need
     // to do it only on Mac OSX > 10.6 as this causes the shader