Bug 1330022 - Remove trivial ValidateUniformMatrixTranspose virtual. - r=kvark

Removing a file reshuffled our unified builds, so this includes the fixes that required as well.
MozReview-Commit-ID: 7ZIoG2xIlS9

dom/canvas/WebGL1Context.h

@@ -31,9 +31,6 @@ public:
 
     // nsWrapperCache
     virtual JSObject* WrapObject(JSContext* cx, JS::Handle<JSObject*> givenProto) override;
-
-private:
-    virtual bool ValidateUniformMatrixTranspose(bool transpose, const char* info) override;
 };
 
 } // namespace mozilla

dom/canvas/WebGL1ContextUniforms.cpp

@@ -1,22 +0,0 @@
-/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "WebGL1Context.h"
-
-namespace mozilla {
-
-bool
-WebGL1Context::ValidateUniformMatrixTranspose(bool transpose, const char* info)
-{
-    if (transpose) {
-        ErrorInvalidValue("%s: transpose must be FALSE as per the "
-                          "OpenGL ES 2.0 spec", info);
-        return false;
-    }
-
-    return true;
-}
-
-} // namespace mozilla

dom/canvas/WebGL2Context.h

@@ -431,7 +431,6 @@ private:
 
     // CreateVertexArrayImpl is assumed to be infallible.
     virtual WebGLVertexArray* CreateVertexArrayImpl() override;
-    virtual bool ValidateUniformMatrixTranspose(bool transpose, const char* info) override;
 };
 
 } // namespace mozilla

dom/canvas/WebGL2ContextUniforms.cpp

@@ -17,12 +17,6 @@
 
 namespace mozilla {
 
-bool
-WebGL2Context::ValidateUniformMatrixTranspose(bool /*transpose*/, const char* /*info*/)
-{
-    return true;
-}
-
 // -------------------------------------------------------------------------
 // Uniforms
 

dom/canvas/WebGLContext.h

@@ -1803,8 +1803,6 @@ private:
     // Context customization points
     virtual WebGLVertexArray* CreateVertexArrayImpl();
 
-    virtual bool ValidateUniformMatrixTranspose(bool transpose, const char* info) = 0;
-
 public:
     void ForceLoseContext(bool simulateLoss = false);
 

dom/canvas/WebGLContextDraw.cpp

@@ -16,6 +16,7 @@
 #include "WebGLRenderbuffer.h"
 #include "WebGLShader.h"
 #include "WebGLTexture.h"
+#include "WebGLTransformFeedback.h"
 #include "WebGLVertexArray.h"
 #include "WebGLVertexAttribData.h"
 

dom/canvas/WebGLContextValidate.cpp

@@ -304,8 +304,10 @@ WebGLContext::ValidateUniformMatrixArraySetter(WebGLUniformLocation* loc,
     if (!loc->ValidateArrayLength(setterElemSize, setterArraySize, funcName))
         return false;
 
-    if (!ValidateUniformMatrixTranspose(setterTranspose, funcName))
+    if (setterTranspose && !IsWebGL2()) {
+        ErrorInvalidValue("%s: `transpose` must be false.", funcName);
         return false;
+    }
 
     const auto& elemCount = loc->mInfo->mActiveInfo->mElemCount;
     MOZ_ASSERT(elemCount > loc->mArrayIndex);

dom/canvas/WebGLFramebuffer.cpp

@@ -1930,7 +1930,7 @@ ImplCycleCollectionUnlink(mozilla::WebGLFBAttachPoint& field)
 
 inline void
 ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& callback,
-                            mozilla::WebGLFBAttachPoint& field,
+                            const mozilla::WebGLFBAttachPoint& field,
                             const char* name,
                             uint32_t flags = 0)
 {
@@ -1950,7 +1950,7 @@ ImplCycleCollectionUnlink(C& field)
 template<typename C>
 inline void
 ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& callback,
-                            C& field,
+                            const C& field,
                             const char* name,
                             uint32_t flags = 0)
 {

dom/canvas/WebGLTransformFeedback.cpp

@@ -8,6 +8,7 @@
 #include "GLContext.h"
 #include "mozilla/dom/WebGL2RenderingContextBinding.h"
 #include "WebGL2Context.h"
+#include "WebGLProgram.h"
 
 namespace mozilla {
 

dom/canvas/moz.build

@@ -95,7 +95,6 @@ SOURCES += [
 UNIFIED_SOURCES += [
     'TexUnpackBlob.cpp',
     'WebGL1Context.cpp',
-    'WebGL1ContextUniforms.cpp',
     'WebGL2Context.cpp',
     'WebGL2ContextBuffers.cpp',
     'WebGL2ContextFramebuffers.cpp',