From a218a252c4200cfe7048de81a46f7e48349084d5 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Wed, 8 Apr 2015 17:04:36 +0300 Subject: Upgrade ANGLE to 2.1~99f075dade7c This aligns with Chromium branch 2356. This version brings more complete OpenGL ES 3 support as well as various bug fixes and performance improvements. The following changes were made to earlier patches: -0000-General-fixes-for-ANGLE-2.1 Removed. All changes are now handled elsewhere. +0001-ANGLE-Improve-Windows-Phone-support Consolidated remaining parts from 0009/0010. +0002-ANGLE-Fix-compilation-with-MinGW Remaining issues from patch 0016. +0003-ANGLE-Fix-compilation-with-MSVC2010 Remaining issues from patch 0015. +0004-ANGLE-Dynamically-load-D3D-compiler-from-list Renamed from patch 0008. +0005-ANGLE-Add-support-for-querying-platform-device Renamed from patch 0013. -0004-Make-it-possible-to-link-ANGLE-statically-for-single Removed. Fixed by adding defines to project files. -0008-ANGLE-Dynamically-load-D3D-compiler-from-a-list-or-t Renamed to patch 0005. -0009-ANGLE-Support-WinRT Removed. Mostly fixed upstream; remaining parts in patch 0001. -0010-ANGLE-Enable-D3D11-for-feature-level-9-cards Removed. Mostly fixed upstream; remaining parts in patch 0001. -0012-ANGLE-fix-semantic-index-lookup Removed. Fixed upstream. -0013-ANGLE-Add-support-for-querying-platform-device Renamed to patch 0005. -0014-Let-ANGLE-use-multithreaded-devices-if-necessary Removed. No longer needed. -0015-ANGLE-Fix-angle-d3d11-on-MSVC2010 Moved remaining parts to patch 0003. -0016-ANGLE-Fix-compilation-with-MinGW-D3D11 Moved remaining parts to patch 0002. -0017-ANGLE-Fix-compilation-with-D3D9 Removed. Fixed upstream. -0018-ANGLE-Fix-releasing-textures-after-we-kill-D3D11 Removed. Fixed upstream. -0019-ANGLE-Fix-handling-of-shader-source-with-fixed-lengt Removed. Fixed upstream. -0020-ANGLE-Do-not-use-std-strlen Removed. Fixed upstream. -0020-ANGLE-Fix-compilation-with-MSVC2013-Update4 Removed. Fixed upstream. [ChangeLog][Third-party libraries] ANGLE was updated to Chromium branch 2356 (2.1~99f075dade7c). Change-Id: I32ccbfe95e10986bd94be7191dfd53445ea09158 Task-number: QTBUG-44815 Task-number: QTBUG-37660 Task-number: QTBUG-44694 Task-number: QTBUG-42443 Reviewed-by: Andrew Knight Reviewed-by: Friedemann Kleint --- src/angle/src/libEGL/libEGL.pro | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) (limited to 'src/angle/src/libEGL') diff --git a/src/angle/src/libEGL/libEGL.pro b/src/angle/src/libEGL/libEGL.pro index a16249309f..94fcebda6b 100644 --- a/src/angle/src/libEGL/libEGL.pro +++ b/src/angle/src/libEGL/libEGL.pro @@ -5,40 +5,13 @@ winrt: LIBS_PRIVATE += -ld3d11 LIBS_PRIVATE += -ldxguid -L$$QT_BUILD_TREE/lib -l$$qtLibraryTarget(libGLESv2) +DEFINES += GL_APICALL= GL_GLEXT_PROTOTYPES= EGLAPI= LIBEGL_IMPLEMENTATION + HEADERS += \ - $$ANGLE_DIR/src/common/NativeWindow.h \ - $$ANGLE_DIR/src/libEGL/AttributeMap.h \ - $$ANGLE_DIR/src/libEGL/Config.h \ - $$ANGLE_DIR/src/libEGL/Display.h \ - $$ANGLE_DIR/src/libEGL/Error.h \ - $$ANGLE_DIR/src/libEGL/main.h \ - $$ANGLE_DIR/src/libEGL/resource.h \ - $$ANGLE_DIR/src/libEGL/ShaderCache.h \ - $$ANGLE_DIR/src/libEGL/Surface.h + $$ANGLE_DIR/src/libEGL/resource.h SOURCES += \ - $$ANGLE_DIR/src/libEGL/AttributeMap.cpp \ - $$ANGLE_DIR/src/libEGL/Config.cpp \ - $$ANGLE_DIR/src/libEGL/Display.cpp \ - $$ANGLE_DIR/src/libEGL/Error.cpp \ - $$ANGLE_DIR/src/libEGL/libEGL.cpp \ - $$ANGLE_DIR/src/libEGL/main.cpp \ - $$ANGLE_DIR/src/libEGL/Surface.cpp - -!winrt { - SOURCES += \ - $$ANGLE_DIR/src/common/win32/NativeWindow.cpp -} else { - HEADERS += \ - $$ANGLE_DIR/src/common/winrt/CoreWindowNativeWindow.h \ - $$ANGLE_DIR/src/common/winrt/InspectableNativeWindow.h \ - $$ANGLE_DIR/src/common/winrt/SwapChainPanelNativeWindow.h - - SOURCES += \ - $$ANGLE_DIR/src/common/winrt/CoreWindowNativeWindow.cpp \ - $$ANGLE_DIR/src/common/winrt/InspectableNativeWindow.cpp \ - $$ANGLE_DIR/src/common/winrt/SwapChainPanelNativeWindow.cpp -} + $$ANGLE_DIR/src/libEGL/libEGL.cpp !static { DEF_FILE = $$ANGLE_DIR/src/libEGL/$${TARGET}.def -- cgit v1.2.3