Commit e842eabd by Jacek Caban Committed by Geoff Lang

Fixed compilation with mingw.

Change-Id: I027cedc383efbd215e55a7ddf4e41eb1c368a1ae Reviewed-on: https://chromium-review.googlesource.com/262590Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarJacek Caban <cjacek@gmail.com>
parent b13daa8f
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
# endif # endif
# include <windows.h> # include <windows.h>
# include <intrin.h>
# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) # if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP)
# define ANGLE_ENABLE_WINDOWS_STORE 1 # define ANGLE_ENABLE_WINDOWS_STORE 1
......
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
// Blit11.cpp: Texture copy utility class. // Blit11.cpp: Texture copy utility class.
#include "libANGLE/renderer/d3d/d3d11/Blit11.h" #include "libANGLE/renderer/d3d/d3d11/Blit11.h"
#include <float.h>
#include "libANGLE/renderer/d3d/d3d11/Renderer11.h" #include "libANGLE/renderer/d3d/d3d11/Renderer11.h"
#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h" #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
#include "libANGLE/renderer/d3d/d3d11/formatutils11.h" #include "libANGLE/renderer/d3d/d3d11/formatutils11.h"
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#include "libANGLE/renderer/d3d/d3d11/RenderStateCache.h" #include "libANGLE/renderer/d3d/d3d11/RenderStateCache.h"
#include <float.h>
#include "common/debug.h" #include "common/debug.h"
#include "libANGLE/Framebuffer.h" #include "libANGLE/Framebuffer.h"
#include "libANGLE/FramebufferAttachment.h" #include "libANGLE/FramebufferAttachment.h"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#ifndef LIBANGLE_RENDERER_D3D_D3D9_RENDERTARGET9_H_ #ifndef LIBANGLE_RENDERER_D3D_D3D9_RENDERTARGET9_H_
#define LIBANGLE_RENDERER_D3D_D3D9_RENDERTARGET9_H_ #define LIBANGLE_RENDERER_D3D_D3D9_RENDERTARGET9_H_
#include "libANGLE/renderer/D3D/RenderTargetD3D.h" #include "libANGLE/renderer/d3d/RenderTargetD3D.h"
namespace rx namespace rx
{ {
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
#include "libANGLE/renderer/gl/renderergl_utils.h" #include "libANGLE/renderer/gl/renderergl_utils.h"
#include <limits>
#include "libANGLE/Caps.h" #include "libANGLE/Caps.h"
#include "libANGLE/renderer/gl/FunctionsGL.h" #include "libANGLE/renderer/gl/FunctionsGL.h"
......
...@@ -41,10 +41,10 @@ class FunctionsGLWindows : public FunctionsGL ...@@ -41,10 +41,10 @@ class FunctionsGLWindows : public FunctionsGL
private: private:
void *loadProcAddress(const std::string &function) override void *loadProcAddress(const std::string &function) override
{ {
void *proc = mGetProcAddressWGL(function.c_str()); void *proc = reinterpret_cast<void*>(mGetProcAddressWGL(function.c_str()));
if (!proc) if (!proc)
{ {
proc = GetProcAddress(mOpenGLModule, function.c_str()); proc = reinterpret_cast<void*>(GetProcAddress(mOpenGLModule, function.c_str()));
} }
return proc; return proc;
} }
......
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