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 234284 1bc888409400bac1afccce481a4d43187f3ad9f9
parent 234283 27ff5a764eca5321bbaa81267b0033e9a9d31664
child 234285 15384e0cd4d4262fffb76309d263aab7023a20e7
push id7354
push userryanvm@gmail.com
push dateFri, 12 Dec 2014 13:57:02 +0000
treeherdermozilla-aurora@993c07956f3d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert, sledru
bugs1062355
milestone36.0a2
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
@@ -3320,17 +3320,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