diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2013-09-18 11:51:20 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 08:53:35 +0200 |
| commit | 1a334f8135d4be7b73b39ac736af0e722c864e83 (patch) | |
| tree | cc0b7703b815e9fca858e8eecd7eb556e186998c /src/angle/patches/0011-Fix-compilation-of-libGLESv2-with-older-MinGW-w64-he.patch | |
| parent | d84ed9a92ae0ce96b843c9dd5c263c6a0925405b (diff) | |
ANGLE: Update to version 2446
Update ANGLE and reapply patches.
Patch changes:
"Dynamically resolve functions of dwmapi.dll"
Removed; ANGLE no longer uses DWM API
"Make it possible to link ANGLE statically for single-thread use"
Avoid name collision by using ANGLE-style getCurrent()
"Fix build when SSE2 is not available."
Added guard for __cpuid(), which is not available on ARM
"Make DX9/DX11 mutually exclusive"
Adjustments due to underlying code changes
"ANGLE: Avoid memory copies on buffers when data is null"
Removed; fixed upstream
"Add missing intrin.h include for __cpuid"
Removed; fixed upstream
Change-Id: I4f3d850fc555d3194ddc05e0b51c4966d33f7eaf
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/angle/patches/0011-Fix-compilation-of-libGLESv2-with-older-MinGW-w64-he.patch')
| -rw-r--r-- | src/angle/patches/0011-Fix-compilation-of-libGLESv2-with-older-MinGW-w64-he.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/angle/patches/0011-Fix-compilation-of-libGLESv2-with-older-MinGW-w64-he.patch b/src/angle/patches/0011-Fix-compilation-of-libGLESv2-with-older-MinGW-w64-he.patch index f104a273cc..9189501b59 100644 --- a/src/angle/patches/0011-Fix-compilation-of-libGLESv2-with-older-MinGW-w64-he.patch +++ b/src/angle/patches/0011-Fix-compilation-of-libGLESv2-with-older-MinGW-w64-he.patch @@ -1,6 +1,6 @@ -From 82fd5de3ae5e242730fdaf8044f17227337d881c Mon Sep 17 00:00:00 2001 +From 6d8be1da6a5a5177289200247f98e0200e0e3df3 Mon Sep 17 00:00:00 2001 From: Kai Koehne <kai.koehne@digia.com> -Date: Wed, 10 Jul 2013 14:00:13 +0200 +Date: Sat, 14 Sep 2013 11:38:47 +0300 Subject: [PATCH] Fix compilation of libGLESv2 with older MinGW-w64 headers Fix compilation of libGLESv2 for mingw-headers predating MinGW-w64 @@ -18,11 +18,11 @@ Change-Id: I31272a1a991c4fc0f1611f8fb7510be51d6bb925 1 file changed, 19 insertions(+) diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.cpp -index 41cdb8b..218356c 100644 +index 70b9326..d1d234b 100644 --- a/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.cpp +++ b/src/3rdparty/angle/src/libGLESv2/renderer/Renderer.cpp -@@ -22,6 +22,25 @@ - #define ANGLE_COMPILE_OPTIMIZATION_LEVEL D3DCOMPILE_OPTIMIZATION_LEVEL3 +@@ -21,6 +21,25 @@ + #define ANGLE_ENABLE_D3D11 0 #endif +#ifdef __MINGW32__ @@ -48,5 +48,5 @@ index 41cdb8b..218356c 100644 { -- -1.8.3.msysgit.0 +1.8.1.msysgit.1 |