Bug 1062355 - Enable SH_LIMIT_CALL_STACK_DEPTH. r=jgilbert
authorDan Glastonbury <dglastonbury@mozilla.com>
Mon, 08 Dec 2014 13:29:29 +1000
changeset 219162 0fe752f786b3d17655046195b37312c39d446a56
parent 219161 5fd522fc83b526f42e5d2d8d4235562609257761
child 219163 0f9b7c71ba3d45c3c671290c822512a2328ddc04
push id52758
push userdglastonbury@mozilla.com
push dateThu, 11 Dec 2014 05:59:21 +0000
treeherdermozilla-inbound@0fe752f786b3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs1062355
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1062355 - Enable SH_LIMIT_CALL_STACK_DEPTH. r=jgilbert
dom/canvas/WebGLContextGL.cpp
--- a/dom/canvas/WebGLContextGL.cpp
+++ b/dom/canvas/WebGLContextGL.cpp
@@ -3318,17 +3318,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