diff options
Diffstat (limited to 'src/angle/patches/0000-General-fixes-for-ANGLE-2.1.patch')
| -rw-r--r-- | src/angle/patches/0000-General-fixes-for-ANGLE-2.1.patch | 568 |
1 files changed, 568 insertions, 0 deletions
diff --git a/src/angle/patches/0000-General-fixes-for-ANGLE-2.1.patch b/src/angle/patches/0000-General-fixes-for-ANGLE-2.1.patch new file mode 100644 index 0000000000..570ae63767 --- /dev/null +++ b/src/angle/patches/0000-General-fixes-for-ANGLE-2.1.patch @@ -0,0 +1,568 @@ +From 7597b9363748afc84d682dd9ef5bc8bc272812f3 Mon Sep 17 00:00:00 2001 +From: Andrew Knight <andrew.knight@digia.com> +Date: Tue, 5 Aug 2014 09:21:44 +0300 +Subject: [PATCH] General fixes for ANGLE 2.1 + +- Fix commit.h include (use hard-coded version) +- Fix undefined intptr_t in egl.h and eglext.h +- Fix export mismatch caused by angle_gl.h +- Remove D3D9 d3dcompiler.h include requirement in the translator +- Normalize all precompiled shader names and includes + +Change-Id: I22254aed62e89a26756ca0784bae95909189c0f9 +--- + src/3rdparty/angle/include/EGL/egl.h | 2 +- + src/3rdparty/angle/include/EGL/eglext.h | 2 +- + src/3rdparty/angle/include/angle_gl.h | 3 + + src/3rdparty/angle/src/common/platform.h | 5 +- + src/3rdparty/angle/src/common/version.h | 2 +- + src/3rdparty/angle/src/libEGL/Config.h | 1 - + src/3rdparty/angle/src/libEGL/Display.cpp | 3 +- + src/3rdparty/angle/src/libEGL/Surface.h | 1 - + src/3rdparty/angle/src/libEGL/main.h | 1 + + src/3rdparty/angle/src/libGLESv2/Context.h | 1 - + src/3rdparty/angle/src/libGLESv2/formatutils.h | 2 +- + src/3rdparty/angle/src/libGLESv2/main.h | 3 + + src/3rdparty/angle/src/libGLESv2/precompiled.h | 1 + + .../angle/src/libGLESv2/renderer/IndexRangeCache.h | 2 +- + .../angle/src/libGLESv2/renderer/Renderer.h | 1 + + .../angle/src/libGLESv2/renderer/copyimage.h | 2 +- + .../src/libGLESv2/renderer/d3d/HLSLCompiler.cpp | 2 + + .../src/libGLESv2/renderer/d3d/d3d11/Blit11.cpp | 66 +++++++++++----------- + .../src/libGLESv2/renderer/d3d/d3d11/Clear11.cpp | 12 ++-- + .../renderer/d3d/d3d11/PixelTransfer11.cpp | 10 ++-- + .../libGLESv2/renderer/d3d/d3d11/SwapChain11.cpp | 6 +- + .../renderer/d3d/d3d11/shaders/Clear11.hlsl | 4 ++ + .../src/libGLESv2/renderer/d3d/d3d9/Blit9.cpp | 20 +++---- + .../src/libGLESv2/renderer/d3d/d3d9/Renderer9.cpp | 4 +- + .../src/libGLESv2/renderer/d3d/d3d9/SwapChain9.cpp | 2 +- + .../libGLESv2/renderer/d3d/d3d9/shaders/Blit.ps | 6 +- + .../libGLESv2/renderer/d3d/d3d9/shaders/Blit.vs | 4 +- + 27 files changed, 92 insertions(+), 76 deletions(-) + +diff --git a/src/3rdparty/angle/include/EGL/egl.h b/src/3rdparty/angle/include/EGL/egl.h +index 12590a0..ab2f0cd 100644 +--- a/src/3rdparty/angle/include/EGL/egl.h ++++ b/src/3rdparty/angle/include/EGL/egl.h +@@ -238,7 +238,7 @@ EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext (void); + #ifndef EGL_VERSION_1_5 + #define EGL_VERSION_1_5 1 + typedef void *EGLSync; +-typedef intptr_t EGLAttrib; ++typedef khronos_intptr_t EGLAttrib; + typedef khronos_utime_nanoseconds_t EGLTime; + #define EGL_CONTEXT_MAJOR_VERSION 0x3098 + #define EGL_CONTEXT_MINOR_VERSION 0x30FB +diff --git a/src/3rdparty/angle/include/EGL/eglext.h b/src/3rdparty/angle/include/EGL/eglext.h +index 9e29605..989359b 100644 +--- a/src/3rdparty/angle/include/EGL/eglext.h ++++ b/src/3rdparty/angle/include/EGL/eglext.h +@@ -59,7 +59,7 @@ extern "C" { + #ifndef EGL_KHR_cl_event2 + #define EGL_KHR_cl_event2 1 + typedef void *EGLSyncKHR; +-typedef intptr_t EGLAttribKHR; ++typedef khronos_intptr_t EGLAttribKHR; + typedef EGLSyncKHR (EGLAPIENTRYP PFNEGLCREATESYNC64KHRPROC) (EGLDisplay dpy, EGLenum type, const EGLAttribKHR *attrib_list); + #ifdef EGL_EGLEXT_PROTOTYPES + EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSync64KHR (EGLDisplay dpy, EGLenum type, const EGLAttribKHR *attrib_list); +diff --git a/src/3rdparty/angle/include/angle_gl.h b/src/3rdparty/angle/include/angle_gl.h +index d093f75..663aa25 100644 +--- a/src/3rdparty/angle/include/angle_gl.h ++++ b/src/3rdparty/angle/include/angle_gl.h +@@ -10,6 +10,9 @@ + #ifndef ANGLE_GL_H_ + #define ANGLE_GL_H_ + ++#define GL_GLEXT_PROTOTYPES ++#define GL_APICALL ++ + #include "GLES2/gl2.h" + #include "GLES2/gl2ext.h" + #include "GLES3/gl3.h" +diff --git a/src/3rdparty/angle/src/common/platform.h b/src/3rdparty/angle/src/common/platform.h +index d07297d..aa0b985 100644 +--- a/src/3rdparty/angle/src/common/platform.h ++++ b/src/3rdparty/angle/src/common/platform.h +@@ -49,7 +49,6 @@ + + # if defined(ANGLE_ENABLE_D3D9) || defined(ANGLE_ENABLE_PERF) + # include <d3d9.h> +-# include <d3dcompiler.h> + # endif + + # if defined(ANGLE_ENABLE_D3D11) +@@ -62,6 +61,10 @@ + + # undef near + # undef far ++# undef NEAR ++# define NEAR ++# undef FAR ++# define FAR + #endif + + #endif // COMMON_PLATFORM_H_ +diff --git a/src/3rdparty/angle/src/common/version.h b/src/3rdparty/angle/src/common/version.h +index d9148d1..f01e024 100644 +--- a/src/3rdparty/angle/src/common/version.h ++++ b/src/3rdparty/angle/src/common/version.h +@@ -1,4 +1,4 @@ +-#include "id/commit.h" ++#include "../commit.h" + + #define ANGLE_MAJOR_VERSION 2 + #define ANGLE_MINOR_VERSION 1 +diff --git a/src/3rdparty/angle/src/libEGL/Config.h b/src/3rdparty/angle/src/libEGL/Config.h +index 680337b..9844114 100644 +--- a/src/3rdparty/angle/src/libEGL/Config.h ++++ b/src/3rdparty/angle/src/libEGL/Config.h +@@ -11,7 +11,6 @@ + #ifndef INCLUDE_CONFIG_H_ + #define INCLUDE_CONFIG_H_ + +-#define EGLAPI + #include <EGL/egl.h> + + #include <set> +diff --git a/src/3rdparty/angle/src/libEGL/Display.cpp b/src/3rdparty/angle/src/libEGL/Display.cpp +index 43d9b26..459648c 100644 +--- a/src/3rdparty/angle/src/libEGL/Display.cpp ++++ b/src/3rdparty/angle/src/libEGL/Display.cpp +@@ -14,6 +14,7 @@ + #include <map> + #include <vector> + #include <sstream> ++#include <iterator> + + #include "common/debug.h" + #include "common/mathutil.h" +@@ -552,7 +553,7 @@ void Display::initDisplayExtensionString() + } + + // TODO: complete support for the EGL_KHR_create_context extension +- extensions.push_back("EGL_KHR_create_context"); ++ //extensions.push_back("EGL_KHR_create_context"); + + std::ostringstream stream; + std::copy(extensions.begin(), extensions.end(), std::ostream_iterator<std::string>(stream, " ")); +diff --git a/src/3rdparty/angle/src/libEGL/Surface.h b/src/3rdparty/angle/src/libEGL/Surface.h +index 2361fcd..3caf620 100644 +--- a/src/3rdparty/angle/src/libEGL/Surface.h ++++ b/src/3rdparty/angle/src/libEGL/Surface.h +@@ -11,7 +11,6 @@ + #ifndef LIBEGL_SURFACE_H_ + #define LIBEGL_SURFACE_H_ + +-#define EGLAPI + #include <EGL/egl.h> + + #include "common/angleutils.h" +diff --git a/src/3rdparty/angle/src/libEGL/main.h b/src/3rdparty/angle/src/libEGL/main.h +index 77da8f0..6030fb6 100644 +--- a/src/3rdparty/angle/src/libEGL/main.h ++++ b/src/3rdparty/angle/src/libEGL/main.h +@@ -9,6 +9,7 @@ + #ifndef LIBEGL_MAIN_H_ + #define LIBEGL_MAIN_H_ + ++#undef EGLAPI + #define EGLAPI + #include <EGL/egl.h> + #include <EGL/eglext.h> +diff --git a/src/3rdparty/angle/src/libGLESv2/Context.h b/src/3rdparty/angle/src/libGLESv2/Context.h +index 4b7e59e..6c93c74 100644 +--- a/src/3rdparty/angle/src/libGLESv2/Context.h ++++ b/src/3rdparty/angle/src/libGLESv2/Context.h +@@ -11,7 +11,6 @@ + #define LIBGLESV2_CONTEXT_H_ + + #include "angle_gl.h" +-#include <EGL/egl.h> + + #include <string> + #include <set> +diff --git a/src/3rdparty/angle/src/libGLESv2/formatutils.h b/src/3rdparty/angle/src/libGLESv2/formatutils.h +index fb4d2a3..2f59279 100644 +--- a/src/3rdparty/angle/src/libGLESv2/formatutils.h ++++ b/src/3rdparty/angle/src/libGLESv2/formatutils.h +@@ -85,4 +85,4 @@ ColorWriteFunction GetColorWriteFunction(GLenum format, GLenum type); + + } + +-#endif LIBGLESV2_FORMATUTILS_H_ ++#endif // LIBGLESV2_FORMATUTILS_H_ +diff --git a/src/3rdparty/angle/src/libGLESv2/main.h b/src/3rdparty/angle/src/libGLESv2/main.h +index 372b03f..c117039 100644 +--- a/src/3rdparty/angle/src/libGLESv2/main.h ++++ b/src/3rdparty/angle/src/libGLESv2/main.h +@@ -10,6 +10,9 @@ + #define LIBGLESV2_MAIN_H_ + + #include "common/debug.h" ++#undef EGLAPI ++#define EGLAPI ++#include <EGL/egl.h> + + namespace egl + { +diff --git a/src/3rdparty/angle/src/libGLESv2/precompiled.h b/src/3rdparty/angle/src/libGLESv2/precompiled.h +index cc935a1..0404eab 100644 +--- a/src/3rdparty/angle/src/libGLESv2/precompiled.h ++++ b/src/3rdparty/angle/src/libGLESv2/precompiled.h +@@ -29,3 +29,4 @@ + #include <string> + #include <unordered_map> + #include <vector> ++#include <iterator> +diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.h b/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.h +index 4318e2b..837a44a 100644 +--- a/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.h ++++ b/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.h +@@ -56,4 +56,4 @@ class IndexRangeCache + + } + +-#endif LIBGLESV2_RENDERER_INDEXRANGECACHE_H ++#endif // LIBGLESV2_RENDERER_INDEXRANGECACHE_H +diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.h b/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.h +index f1c7b49..be3ba29 100644 +--- a/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.h ++++ b/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.h +@@ -15,6 +15,7 @@ + #include "libGLESv2/Caps.h" + + #if !defined(ANGLE_COMPILE_OPTIMIZATION_LEVEL) ++#include <d3dcompiler.h> + // WARNING: D3DCOMPILE_OPTIMIZATION_LEVEL3 may lead to a DX9 shader compiler hang. + // It should only be used selectively to work around specific bugs. + #define ANGLE_COMPILE_OPTIMIZATION_LEVEL D3DCOMPILE_OPTIMIZATION_LEVEL1 +diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/copyimage.h b/src/3rdparty/angle/src/libGLESv2/renderer/copyimage.h +index 2f37e1c..9b94404 100644 +--- a/src/3rdparty/angle/src/libGLESv2/renderer/copyimage.h ++++ b/src/3rdparty/angle/src/libGLESv2/renderer/copyimage.h +@@ -30,7 +30,7 @@ void WriteColor(const void *source, void *dest) + template <typename sourceType, typename destType, typename colorDataType> + void CopyPixel(const void *source, void *dest) + { +- colorType temp; ++ colorDataType temp; + ReadColor<sourceType, colorDataType>(source, &temp); + WriteColor<destType, colorDataType>(&temp, dest); + } +diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/HLSLCompiler.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/HLSLCompiler.cpp +index 5613919..499ed52 100644 +--- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/HLSLCompiler.cpp ++++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/HLSLCompiler.cpp +@@ -7,6 +7,8 @@ + + #include "third_party/trace_event/trace_event.h" + ++#include <d3dcompiler.h> ++ + namespace rx + { + +diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/Blit11.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/Blit11.cpp +index 446149c..79a6543 100644 +--- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/Blit11.cpp ++++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/Blit11.cpp +@@ -14,39 +14,39 @@ + #include "libGLESv2/renderer/d3d/d3d11/renderer11_utils.h" + #include "libGLESv2/renderer/d3d/d3d11/formatutils11.h" + +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughdepth2d11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dui11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2di11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2d11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2dui11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2di11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg2d11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg2dui11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg2di11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr2d11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr2dui11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr2di11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughlum2d11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2d11ps.h" +- +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthrough3d11vs.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthrough3d11gs.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3d11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3dui11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3di11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3d11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3dui11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3di11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg3d11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg3dui11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg3di11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr3d11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr3dui11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr3di11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughlum3d11ps.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha3d11ps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthrough2dvs.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughdepth2dps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2duips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2dps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2duips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb2dips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg2dps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg2duips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg2dips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr2dps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr2duips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr2dips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughlum2dps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha2dps.h" ++ ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthrough3dvs.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthrough3dgs.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3dps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3duips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba3dips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3dps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3duips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgb3dips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg3dps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg3duips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrg3dips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr3dps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr3duips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughr3dips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughlum3dps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughlumalpha3dps.h" + + #include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/swizzlef2dps.h" + #include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/swizzlei2dps.h" +diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/Clear11.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/Clear11.cpp +index 656cd94..9cd0b7d 100644 +--- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/Clear11.cpp ++++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/Clear11.cpp +@@ -16,14 +16,14 @@ + #include "libGLESv2/Framebuffer.h" + #include "libGLESv2/FramebufferAttachment.h" + +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearfloat11vs.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearfloat11ps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearfloatvs.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearfloatps.h" + +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearuint11vs.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearuint11ps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearuintvs.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearuintps.h" + +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearsint11vs.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearsint11ps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearsintvs.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/clearsintps.h" + + namespace rx + { +diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/PixelTransfer11.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/PixelTransfer11.cpp +index 1ca456c..67540bb 100644 +--- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/PixelTransfer11.cpp ++++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/PixelTransfer11.cpp +@@ -23,11 +23,11 @@ + #include "libGLESv2/Context.h" + + // Precompiled shaders +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_vs.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_gs.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4f.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4i.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/buffertotexture11_ps_4ui.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/buffertotexturevs.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/buffertotexturegs.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/buffertotexture_4fps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/buffertotexture_4ips.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/buffertotexture_4uips.h" + + namespace rx + { +diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/SwapChain11.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/SwapChain11.cpp +index ed0c4ae..98166f0 100644 +--- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/SwapChain11.cpp ++++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/SwapChain11.cpp +@@ -12,8 +12,8 @@ + #include "libGLESv2/renderer/d3d/d3d11/renderer11_utils.h" + #include "libGLESv2/renderer/d3d/d3d11/formatutils11.h" + #include "libGLESv2/renderer/d3d/d3d11/Renderer11.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthrough2d11vs.h" +-#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2d11ps.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthrough2dvs.h" ++#include "libGLESv2/renderer/d3d/d3d11/shaders/compiled/passthroughrgba2dps.h" + + namespace rx + { +@@ -584,7 +584,7 @@ EGLint SwapChain11::swapRect(EGLint x, EGLint y, EGLint width, EGLint height) + // Draw + deviceContext->Draw(4, 0); + +-#ifdef ANGLE_FORCE_VSYNC_OFF ++#if ANGLE_FORCE_VSYNC_OFF + result = mSwapChain->Present(0, 0); + #else + result = mSwapChain->Present(mSwapInterval, 0); +diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/shaders/Clear11.hlsl b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/shaders/Clear11.hlsl +index 6deef2b..b4cf380 100644 +--- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/shaders/Clear11.hlsl ++++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d11/shaders/Clear11.hlsl +@@ -13,10 +13,12 @@ struct PS_OutputFloat + float4 color1 : SV_TARGET1; + float4 color2 : SV_TARGET2; + float4 color3 : SV_TARGET3; ++#if SM4 + float4 color4 : SV_TARGET4; + float4 color5 : SV_TARGET5; + float4 color6 : SV_TARGET6; + float4 color7 : SV_TARGET7; ++#endif + }; + + PS_OutputFloat PS_ClearFloat(in float4 inPosition : SV_POSITION, in float4 inColor : COLOR) +@@ -26,10 +28,12 @@ PS_OutputFloat PS_ClearFloat(in float4 inPosition : SV_POSITION, in float4 inCol + outColor.color1 = inColor; + outColor.color2 = inColor; + outColor.color3 = inColor; ++#if SM4 + outColor.color4 = inColor; + outColor.color5 = inColor; + outColor.color6 = inColor; + outColor.color7 = inColor; ++#endif + return outColor; + } + +diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/Blit9.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/Blit9.cpp +index 2d72729..f486e5a 100644 +--- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/Blit9.cpp ++++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/Blit9.cpp +@@ -28,20 +28,20 @@ namespace + + const BYTE* const g_shaderCode[] = + { +- g_vs20_standardvs, +- g_vs20_flipyvs, +- g_ps20_passthroughps, +- g_ps20_luminanceps, +- g_ps20_componentmaskps ++ g_vs20_VS_standard, ++ g_vs20_VS_flipy, ++ g_ps20_PS_passthrough, ++ g_ps20_PS_luminance, ++ g_ps20_PS_componentmask + }; + + const size_t g_shaderSize[] = + { +- sizeof(g_vs20_standardvs), +- sizeof(g_vs20_flipyvs), +- sizeof(g_ps20_passthroughps), +- sizeof(g_ps20_luminanceps), +- sizeof(g_ps20_componentmaskps) ++ sizeof(g_vs20_VS_standard), ++ sizeof(g_vs20_VS_flipy), ++ sizeof(g_ps20_PS_passthrough), ++ sizeof(g_ps20_PS_luminance), ++ sizeof(g_ps20_PS_componentmask) + }; + } + +diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/Renderer9.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/Renderer9.cpp +index 69c3feb..491c27a 100644 +--- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/Renderer9.cpp ++++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/Renderer9.cpp +@@ -205,7 +205,7 @@ EGLint Renderer9::initialize() + { + TRACE_EVENT0("gpu", "D3d9Ex_QueryInterface"); + ASSERT(mD3d9Ex); +- mD3d9Ex->QueryInterface(__uuidof(IDirect3D9), reinterpret_cast<void**>(&mD3d9)); ++ mD3d9Ex->QueryInterface(IID_IDirect3D9, reinterpret_cast<void**>(&mD3d9)); + ASSERT(mD3d9); + } + else +@@ -343,7 +343,7 @@ EGLint Renderer9::initialize() + if (mD3d9Ex) + { + TRACE_EVENT0("gpu", "mDevice_QueryInterface"); +- result = mDevice->QueryInterface(__uuidof(IDirect3DDevice9Ex), (void**)&mDeviceEx); ++ result = mDevice->QueryInterface(IID_IDirect3DDevice9Ex, (void**)&mDeviceEx); + ASSERT(SUCCEEDED(result)); + } + +diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/SwapChain9.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/SwapChain9.cpp +index aef80a7..4a17acf 100644 +--- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/SwapChain9.cpp ++++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/SwapChain9.cpp +@@ -50,7 +50,7 @@ void SwapChain9::release() + + static DWORD convertInterval(EGLint interval) + { +-#ifdef ANGLE_FORCE_VSYNC_OFF ++#if ANGLE_FORCE_VSYNC_OFF + return D3DPRESENT_INTERVAL_IMMEDIATE; + #else + switch(interval) +diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/shaders/Blit.ps b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/shaders/Blit.ps +index dc357d0..eb43eb3 100644 +--- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/shaders/Blit.ps ++++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/shaders/Blit.ps +@@ -11,7 +11,7 @@ uniform float4 add : c1; + + // Passthrough Pixel Shader + // Outputs texture 0 sampled at texcoord 0. +-float4 passthroughps(float4 texcoord : TEXCOORD0) : COLOR ++float4 PS_passthrough(float4 texcoord : TEXCOORD0) : COLOR + { + return tex2D(tex, texcoord.xy); + }; +@@ -19,7 +19,7 @@ float4 passthroughps(float4 texcoord : TEXCOORD0) : COLOR + // Luminance Conversion Pixel Shader + // Performs a mad operation using the LA data from the texture with mult.xw and add.xw. + // Returns data in the form of llla +-float4 luminanceps(float4 texcoord : TEXCOORD0) : COLOR ++float4 PS_luminance(float4 texcoord : TEXCOORD0) : COLOR + { + return (tex2D(tex, texcoord.xy).xw * mult.xw + add.xw).xxxy; + }; +@@ -27,7 +27,7 @@ float4 luminanceps(float4 texcoord : TEXCOORD0) : COLOR + // RGB/A Component Mask Pixel Shader + // Performs a mad operation using the texture's RGBA data with mult.xyzw and add.xyzw. + // Returns data in the form of rgba +-float4 componentmaskps(float4 texcoord : TEXCOORD0) : COLOR ++float4 PS_componentmask(float4 texcoord : TEXCOORD0) : COLOR + { + return tex2D(tex, texcoord.xy) * mult + add; + }; +diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/shaders/Blit.vs b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/shaders/Blit.vs +index 3a36980..3bd611b 100644 +--- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/shaders/Blit.vs ++++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d/d3d9/shaders/Blit.vs +@@ -17,7 +17,7 @@ uniform float4 halfPixelSize : c0; + // Outputs the homogenous position as-is. + // Outputs a tex coord with (0,0) in the upper-left corner of the screen and (1,1) in the bottom right. + // C0.X must be negative half-pixel width, C0.Y must be half-pixel height. C0.ZW must be 0. +-VS_OUTPUT standardvs(in float4 position : POSITION) ++VS_OUTPUT VS_standard(in float4 position : POSITION) + { + VS_OUTPUT Out; + +@@ -32,7 +32,7 @@ VS_OUTPUT standardvs(in float4 position : POSITION) + // Outputs the homogenous position as-is. + // Outputs a tex coord with (0,1) in the upper-left corner of the screen and (1,0) in the bottom right. + // C0.XY must be the half-pixel width and height. C0.ZW must be 0. +-VS_OUTPUT flipyvs(in float4 position : POSITION) ++VS_OUTPUT VS_flipy(in float4 position : POSITION) + { + VS_OUTPUT Out; + +-- +1.9.0.msysgit.0 + |