diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2014-08-05 12:59:44 +0300 |
|---|---|---|
| committer | Andrew Knight <andrew.knight@digia.com> | 2014-08-05 16:43:22 +0200 |
| commit | a6a12d8c0fc918972c15268f749ecc7c90b95d6c (patch) | |
| tree | cb6d986d30ef97e932ab51768854d5d9b46729d3 /src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch | |
| parent | 14f9c09542bd6cc19430473da9ce4c68f239ec7d (diff) | |
ANGLE: upgrade to 2.1~07d49ef5350a
This version of ANGLE provides partial ES3 support, numerous
bug fixes, and several potentially useful vendor extensions.
All patches have been rebased. The following changes are noted:
0000-General-fixes-for-ANGLE-2.1.patch
contains compile fixes for the new ANGLE
0004-Make-it-possible-to-link-ANGLE-statically-for-single.patch
has incorporated patch 0015.
0007-Make-DX9-DX11-mutually-exclusive.patch
has been removed as it was fixed upstream.
0007-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch
has been moved up to fill the patch number gap.
0010-ANGLE-Enable-D3D11-for-feature-level-9-cards.patch
now contains patch 0014 and 0017.
0013-ANGLE-Allow-for-universal-program-binaries.patch
has been removed as it is no longer relevant.
0014-ANGLE-D3D11-Fix-internal-index-buffer-for-level-9-ha.patch
has been merged with patch 0010.
0015-ANGLE-Don-t-export-DLLMain-functions-for-static-buil.patch
has been merged with patch 0004.
0016-ANGLE-WinRT-Call-Trim-when-application-suspends.patch
has been removed and will be replaced by a follow-up patch using a
different technique.
0017-ANGLE-D3D11-Don-t-use-mipmaps-in-level-9-textures.patch
has been merged with patch 0010.
0018-ANGLE-WinRT-Create-swap-chain-using-physical-resolut.patch
has been removed and will be replaced by a follow-up patch extending
the EGL_ANGLE_window_fixed_size extension.
0019-Fix-ANGLE-build-with-Microsoft-Visual-Studio-14-CTP.patch
is now patch 0007.
[ChangeLog][Third-party libraries] ANGLE has been upgraded to
version 2.1, bringing partial support for OpenGL ES3 over
Direct3D 11, numerous bug fixes, and several new vendor extensions.
Change-Id: I6d95ce1480462d67228d83c1e5c74a1706b5b21c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch')
| -rw-r--r-- | src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch b/src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch index 06ab16abdb..0c04bf7fb2 100644 --- a/src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch +++ b/src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch @@ -1,7 +1,7 @@ -From 88297d02fd1aed6cac258b72d9d0a8baabad6203 Mon Sep 17 00:00:00 2001 +From da7db59c7a004bb8247dcd64e468b689f3cce163 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann <Thomas.Hartmann@digia.com> -Date: Mon, 17 Feb 2014 16:56:51 +0200 -Subject: [PATCH] Fix compilation for MSVC 2008 and std::tuple +Date: Sat, 28 Jun 2014 16:42:22 +0300 +Subject: [PATCH 01/12] Fix compilation for MSVC 2008 and std::tuple For MSVC 2008 make_tuple is in the tr1 namespace. @@ -11,7 +11,7 @@ Change-Id: I4a51f6cabdf068993869b404b12ed1484a21a9d4 1 file changed, 4 insertions(+) diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.cpp -index 610a5ef..51d7f0b 100644 +index 14410d0..e957d96 100644 --- a/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.cpp +++ b/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.cpp @@ -81,7 +81,11 @@ IndexRangeCache::IndexRange::IndexRange(GLenum typ, intptr_t off, GLsizei c) @@ -27,5 +27,5 @@ index 610a5ef..51d7f0b 100644 IndexRangeCache::IndexBounds::IndexBounds() -- -1.8.4.msysgit.0 +1.9.0.msysgit.0 |