Bug 1225280 - mingw fixup. r=upstream

--HG--
extra : rebase_source : f3a1dbbb4fcab73aca7b3622113123428f37ea03
This commit is contained in:
Jacek Caban 2015-12-03 11:38:24 +01:00
parent 001ae677a5
commit 5f1aa8ed06

View File

@ -208,6 +208,16 @@ void GetUniformBlockInfo(const std::vector<VarT> &fields,
}
}
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,
@ -1911,16 +1921,6 @@ void ProgramD3D::defineUniform(GLenum shaderType,
}
}
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)
{