diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-12 07:31:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-12 08:33:08 +0200 |
| commit | 990969655c5fb4d03682e96df9b12101f5ee9815 (patch) | |
| tree | b8fb5c50285105c8bc5a938fb50f93ff9f24889d /src/angle/patches/0009-ANGLE-Fix-winrt-backing-store-to-support-feature-lev.patch | |
| parent | a213011a53f12f101d08a04afc8fdacd2d54a232 (diff) | |
| parent | e64b2234e829cc47872225debcf80d6c06db18f0 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
config_help.txt
configure
src/corelib/io/qprocess_wince.cpp
src/plugins/platforms/windows/qwindowstheme.cpp
src/plugins/platforms/xcb/qxcbbackingstore.cpp
tests/auto/corelib/tools/qtimezone/BLACKLIST
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: I26644d1cb3b78412c8ff285e2a55bea1bd641c01
Diffstat (limited to 'src/angle/patches/0009-ANGLE-Fix-winrt-backing-store-to-support-feature-lev.patch')
| -rw-r--r-- | src/angle/patches/0009-ANGLE-Fix-winrt-backing-store-to-support-feature-lev.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/src/angle/patches/0009-ANGLE-Fix-winrt-backing-store-to-support-feature-lev.patch b/src/angle/patches/0009-ANGLE-Fix-winrt-backing-store-to-support-feature-lev.patch deleted file mode 100644 index 8f66b0c1d8..0000000000 --- a/src/angle/patches/0009-ANGLE-Fix-winrt-backing-store-to-support-feature-lev.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 54461670e035ffcb41268a02e9b0c441cc008ddb Mon Sep 17 00:00:00 2001 -From: Samuel Nevala <samuel.nevala@intopalo.com> -Date: Thu, 22 Oct 2015 14:02:28 +0300 -Subject: [PATCH] ANGLE: Fix winrt backing store to support feature level 9_3 - devices. - -Partially revert c7abf81786f4a0c. Instead of using ES3 entry point -use ES2 for blitting. Small change is also required to ANGLE that -makes ES2 entry to behave same as ES3. - -Task-Id: QTBUG-48266 -Change-Id: Idc51f00a659c91f740876be071eb71bff69e0e38 ---- - .../src/libGLESv2/entry_points_gles_2_0_ext.cpp | 4 +++ - ...inrt-backing-store-to-support-feature-lev.patch | 33 ++++++++++++++++++++++ - src/plugins/platforms/winrt/qwinrtbackingstore.cpp | 11 ++++---- - 3 files changed, 42 insertions(+), 6 deletions(-) - create mode 100644 src/angle/patches/0009-ANGLE-Fix-winrt-backing-store-to-support-feature-lev.patch - -diff --git a/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0_ext.cpp b/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0_ext.cpp -index 8be6ae7..d41c5a4 100644 ---- a/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0_ext.cpp -+++ b/src/3rdparty/angle/src/libGLESv2/entry_points_gles_2_0_ext.cpp -@@ -659,7 +659,11 @@ void GL_APIENTRY BlitFramebufferANGLE(GLint srcX0, GLint srcY0, GLint srcX1, GLi - { - if (!ValidateBlitFramebufferParameters(context, srcX0, srcY0, srcX1, srcY1, - dstX0, dstY0, dstX1, dstY1, mask, filter, -+#ifndef ANGLE_ENABLE_WINDOWS_STORE - true)) -+#else -+ false)) -+#endif - { - return; - } --- -1.9.5.msysgit.1 - |