summaryrefslogtreecommitdiff
path: root/src/angle/patches/0004-ANGLE-fix-usage-of-shared-handles-for-WinRT-applicat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'src/angle/patches/0004-ANGLE-fix-usage-of-shared-handles-for-WinRT-applicat.patch')
-rw-r--r--src/angle/patches/0004-ANGLE-fix-usage-of-shared-handles-for-WinRT-applicat.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/src/angle/patches/0004-ANGLE-fix-usage-of-shared-handles-for-WinRT-applicat.patch b/src/angle/patches/0004-ANGLE-fix-usage-of-shared-handles-for-WinRT-applicat.patch
new file mode 100644
index 0000000000..72a72f15be
--- /dev/null
+++ b/src/angle/patches/0004-ANGLE-fix-usage-of-shared-handles-for-WinRT-applicat.patch
@@ -0,0 +1,37 @@
+From 67125df3f31dfad0feec81c49c2b317c6d418f4e Mon Sep 17 00:00:00 2001
+From: Oliver Wolff <oliver.wolff@qt.io>
+Date: Wed, 22 Aug 2018 13:08:19 +0200
+Subject: [PATCH 4/8] ANGLE: fix usage of shared handles for WinRT applications
+
+The check is not relevant in Qt's context and was skipped before but
+it sneaked back in with the latest ANGLE update.
+
+Change-Id: Ic44de5468a3254afd76ef4804d97d245676daeb1
+---
+ src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
+index f696e360ef..cb4e51e42a 100644
+--- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
++++ b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
+@@ -2270,6 +2270,8 @@ bool Renderer11::getShareHandleSupport() const
+ return false;
+ }
+
++ // Qt: we don't care about the 9_3 limitation
++#if 0
+ // Also disable share handles on Feature Level 9_3, since it doesn't support share handles on
+ // RGBA8 textures/swapchains.
+ if (mRenderer11DeviceCaps.featureLevel <= D3D_FEATURE_LEVEL_9_3)
+@@ -2277,6 +2279,7 @@ bool Renderer11::getShareHandleSupport() const
+ mSupportsShareHandles = false;
+ return false;
+ }
++#endif
+
+ // Find out which type of D3D11 device the Renderer11 is using
+ d3d11::ANGLED3D11DeviceType deviceType = getDeviceType();
+--
+2.15.0.windows.1
+