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>

1 files changed, 7 insertions, 11 deletions

diff --git a/src/angle/src/config.pri b/src/angle/src/config.pri
index aa777c356f..ccc4cb16a1 100644
--- a/src/angle/src/config.pri
+++ b/src/angle/src/config.pri
@@ -37,17 +37,10 @@ DEFINES +=  _WINDOWS \
             NOMINMAX \
             WIN32_LEAN_AND_MEAN=1
 
-# Defines specifying the API version (0x0600 = Vista, 0x0602 = Win8))
-winrt {
-    DEFINES += _WIN32_WINNT=0x0602 WINVER=0x0602
-    DEFINES += ANGLE_ENABLE_UNIVERSAL_BINARY
-} else {
-    DEFINES += _WIN32_WINNT=0x0600 WINVER=0x0600
-    DEFINES += ANGLE_ENABLE_D3D9
-}
+!winrt: DEFINES += ANGLE_ENABLE_D3D9
 
 angle_d3d11 {
-    DEFINES += ANGLE_ENABLE_D3D11
+    DEFINES += ANGLE_ENABLE_D3D11 ANGLE_DEFAULT_D3D11=1
     !build_pass: message("Enabling D3D11 mode for ANGLE")
 }
 
@@ -71,11 +64,12 @@ msvc {
     #   4239: nonstandard extension used : 'token' : conversion from 'type' to 'type'
     #   4244: 'argument' : conversion from 'type1' to 'type2', possible loss of data
     #   4245: 'conversion' : conversion from 'type1' to 'type2', signed/unsigned mismatch
+    #   4267: coversion from 'size_t' to 'int', possible loss of data
     #   4275: non - DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier'
     #   4512: 'class' : assignment operator could not be generated
     #   4702: unreachable code
     QMAKE_CFLAGS_WARN_ON    -= -W3
-    QMAKE_CFLAGS_WARN_ON    += -W4 -wd"4100" -wd"4127" -wd"4189" -wd"4239" -wd"4244" -wd"4245" -wd"4275" -wd"4512" -wd"4702"
+    QMAKE_CFLAGS_WARN_ON    += -W4 -wd"4100" -wd"4127" -wd"4189" -wd"4239" -wd"4244" -wd"4245" -wd"4267" -wd"4275" -wd"4512" -wd"4702"
     # Optimizations
     #   /Oy:   Omits frame pointer (x86 only).
     #   /Gy:   Enables function-level linking.
@@ -93,9 +87,11 @@ gcc {
     QMAKE_CFLAGS_WARN_ON += -Wno-unknown-pragmas -Wno-comment -Wno-missing-field-initializers \
                             -Wno-switch -Wno-unused-parameter -Wno-write-strings -Wno-sign-compare -Wno-missing-braces \
                             -Wno-unused-but-set-variable -Wno-unused-variable -Wno-narrowing -Wno-maybe-uninitialized \
-                            -Wno-strict-aliasing -Wno-type-limits
+                            -Wno-strict-aliasing -Wno-type-limits -Wno-unused-local-typedefs
 
     QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Wno-reorder -Wno-conversion-null -Wno-delete-non-virtual-dtor
+
+    sse2: QMAKE_CXXFLAGS += -march=native
 }
 
 QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG