a218a252c4
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 <qt@panimo.net> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
33 lines
1.2 KiB
Plaintext
33 lines
1.2 KiB
Plaintext
# WinCE does not have a platform directory for .prf files, and the
|
|
# win32 directory is searched for .prfs by qmake on WinCE. Ideally
|
|
# there should be a features/wince/opengl.prf which contains the wince
|
|
# block below.
|
|
|
|
wince* {
|
|
include(../unix/opengl.prf)
|
|
} else {
|
|
contains(QT_CONFIG, opengles2) {
|
|
# For Desktop, use the ANGLE library location passed on from configure.
|
|
INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
|
|
CONFIG(debug, debug|release) {
|
|
QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_DEBUG
|
|
contains(QT_CONFIG, angle) {
|
|
LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG
|
|
} else {
|
|
LIBS += $$QMAKE_LIBS_OPENGL_ES2
|
|
}
|
|
} else {
|
|
LIBS += $$QMAKE_LIBS_OPENGL_ES2
|
|
QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_RELEASE
|
|
}
|
|
DEFINES += QT_OPENGL_ES_2 QT_OPENGL_ES_2_ANGLE
|
|
contains(QT_CONFIG, static): DEFINES += QT_OPENGL_ES_2_ANGLE_STATIC GL_APICALL= EGLAPI=
|
|
QT_CONFIG -= opengl
|
|
} else {
|
|
!contains(QT_CONFIG, dynamicgl) {
|
|
QMAKE_LIBS += $$QMAKE_LIBS_OPENGL
|
|
QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL
|
|
}
|
|
}
|
|
}
|