Commit 2302e69a by Jacek Caban Committed by Geoff Lang

Fixed compilation with mingw.

Change-Id: I8102ce4dd934ac247a29e31140d3a1eca691802f Reviewed-on: https://chromium-review.googlesource.com/315060Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent fa697210
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "libANGLE/renderer/DeviceImpl.h" #include "libANGLE/renderer/DeviceImpl.h"
#if defined(ANGLE_ENABLE_D3D11) #if defined(ANGLE_ENABLE_D3D11)
#include "libANGLE/renderer/D3D/DeviceD3D.h" #include "libANGLE/renderer/d3d/DeviceD3D.h"
#endif #endif
namespace egl namespace egl
......
...@@ -209,6 +209,16 @@ void GetUniformBlockInfo(const std::vector<VarT> &fields, ...@@ -209,6 +209,16 @@ void GetUniformBlockInfo(const std::vector<VarT> &fields,
} }
template <typename T> 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, bool TransposeMatrix(T *target,
const GLfloat *value, const GLfloat *value,
int targetWidth, int targetWidth,
...@@ -1911,16 +1921,6 @@ void ProgramD3D::defineUniform(GLenum shaderType, ...@@ -1911,16 +1921,6 @@ void ProgramD3D::defineUniform(GLenum shaderType,
} }
template <typename T> 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) void ProgramD3D::setUniform(GLint location, GLsizei countIn, const T *v, GLenum targetUniformType)
{ {
const int components = gl::VariableComponentCount(targetUniformType); const int components = gl::VariableComponentCount(targetUniformType);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment