Bug 1225280 - mingw fixup. r=upstream
authorJacek Caban <jacek@codeweavers.com>
Thu, 03 Dec 2015 11:38:24 +0100
changeset 309588 ac6a89c954775a83b347fcd220f314ad49df500e
parent 309587 d37627931b2ba7e4de8d3059e4b62500d3ba97ea
child 309589 29408f18b82e6319b8db1649e81c6add291dbe04
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersupstream
bugs1225280
milestone45.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 1225280 - mingw fixup. r=upstream
gfx/angle/src/libANGLE/renderer/d3d/ProgramD3D.cpp
--- a/gfx/angle/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/gfx/angle/src/libANGLE/renderer/d3d/ProgramD3D.cpp
@@ -204,16 +204,26 @@ void GetUniformBlockInfo(const std::vect
             bool isRowMajorMatrix = (gl::IsMatrixType(field.type) && inRowMajorLayout);
             (*blockInfoOut)[fieldName] =
                 encoder->encodeType(field.type, field.arraySize, isRowMajorMatrix);
         }
     }
 }
 
 template <typename T>
+static inline void SetIfDirty(T *dest, const T &source, bool *dirtyFlag)
+{
+    ASSERT(dest != NULL);
+    ASSERT(dirtyFlag != NULL);
+
+    *dirtyFlag = *dirtyFlag || (memcmp(dest, &source, sizeof(T)) != 0);
+    *dest      = source;
+}
+
+template <typename T>
 bool TransposeMatrix(T *target,
                      const GLfloat *value,
                      int targetWidth,
                      int targetHeight,
                      int srcWidth,
                      int srcHeight)
 {
     bool dirty = false;
@@ -1907,26 +1917,16 @@ void ProgramD3D::defineUniform(GLenum sh
         if (uniform.isArray())
         {
             encoder->exitAggregateType();
         }
     }
 }
 
 template <typename T>
-static inline void SetIfDirty(T *dest, const T &source, bool *dirtyFlag)
-{
-    ASSERT(dest != NULL);
-    ASSERT(dirtyFlag != NULL);
-
-    *dirtyFlag = *dirtyFlag || (memcmp(dest, &source, sizeof(T)) != 0);
-    *dest      = source;
-}
-
-template <typename T>
 void ProgramD3D::setUniform(GLint location, GLsizei countIn, const T *v, GLenum targetUniformType)
 {
     const int components        = gl::VariableComponentCount(targetUniformType);
     const GLenum targetBoolType = gl::VariableBoolVectorType(targetUniformType);
 
     D3DUniform *targetUniform = getD3DUniformFromLocation(location);
 
     unsigned int elementCount = targetUniform->elementCount();