Back out changeset d34a1af95066 (bug 1207288) for Windows mochitest-gl not being that into being validated
authorPhil Ringnalda <philringnalda@gmail.com>
Tue, 13 Oct 2015 20:00:38 -0700
changeset 288757 01d6f8dc4daac7d11a8f75fe9e27a9f11379443d
parent 288756 e7dbcd77219ca920c87da40ff0c04926d98b943d
child 288758 ec49c03a05975e5694ae665b9f9a596a2c636341
push id8654
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:48:40 +0000
treeherdermozilla-aurora@bc4551debe17 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1207288
milestone44.0a1
backs outd34a1af95066e1d0bd67ca95581fbf5def74bbee
Back out changeset d34a1af95066 (bug 1207288) for Windows mochitest-gl not being that into being validated CLOSED TREE
dom/canvas/WebGL2Context.cpp
dom/canvas/WebGLShaderValidator.cpp
--- a/dom/canvas/WebGL2Context.cpp
+++ b/dom/canvas/WebGL2Context.cpp
@@ -175,12 +175,14 @@ WebGLContext::InitWebGL2()
     }
 
     mBoundTransformFeedbackBuffers.SetLength(mGLMaxTransformFeedbackSeparateAttribs);
     mBoundUniformBuffers.SetLength(mGLMaxUniformBufferBindings);
 
     mDefaultTransformFeedback = new WebGLTransformFeedback(this, 0);
     mBoundTransformFeedback = mDefaultTransformFeedback;
 
+    mBypassShaderValidation = true;
+
     return true;
 }
 
 } // namespace mozilla
--- a/dom/canvas/WebGLShaderValidator.cpp
+++ b/dom/canvas/WebGLShaderValidator.cpp
@@ -94,17 +94,17 @@ ChooseValidatorCompileOptions(const ShBu
 ////////////////////////////////////////
 
 webgl::ShaderValidator*
 WebGLContext::CreateShaderValidator(GLenum shaderType) const
 {
     if (mBypassShaderValidation)
         return nullptr;
 
-    ShShaderSpec spec = IsWebGL2() ? SH_WEBGL2_SPEC : SH_WEBGL_SPEC;
+    ShShaderSpec spec = SH_WEBGL_SPEC;
     ShShaderOutput outputLanguage = gl->IsGLES() ? SH_ESSL_OUTPUT
                                                  : SH_GLSL_OUTPUT;
 
     ShBuiltInResources resources;
     memset(&resources, 0, sizeof(resources));
     ShInitBuiltInResources(&resources);
 
     resources.HashFunction = webgl::IdentifierHashFunc;