summaryrefslogtreecommitdiffstats
path: root/src/angle/patches/0016-ANGLE-WinRT-Call-Trim-when-application-suspends.patch
diff options
context:
space:
mode:
authorAndrew Knight <andrew.knight@digia.com>2014-08-05 12:59:44 +0300
committerAndrew Knight <andrew.knight@digia.com>2014-08-05 16:43:22 +0200
commita6a12d8c0fc918972c15268f749ecc7c90b95d6c (patch)
treecb6d986d30ef97e932ab51768854d5d9b46729d3 /src/angle/patches/0016-ANGLE-WinRT-Call-Trim-when-application-suspends.patch
parent14f9c09542bd6cc19430473da9ce4c68f239ec7d (diff)
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>
Diffstat (limited to 'src/angle/patches/0016-ANGLE-WinRT-Call-Trim-when-application-suspends.patch')
-rw-r--r--src/angle/patches/0016-ANGLE-WinRT-Call-Trim-when-application-suspends.patch118
1 files changed, 0 insertions, 118 deletions
diff --git a/src/angle/patches/0016-ANGLE-WinRT-Call-Trim-when-application-suspends.patch b/src/angle/patches/0016-ANGLE-WinRT-Call-Trim-when-application-suspends.patch
deleted file mode 100644
index bf2a1ad363..0000000000
--- a/src/angle/patches/0016-ANGLE-WinRT-Call-Trim-when-application-suspends.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 158b7642c53843ed954fa667ff23b8746f95f8eb Mon Sep 17 00:00:00 2001
-From: Andrew Knight <andrew.knight@digia.com>
-Date: Tue, 22 Apr 2014 09:13:57 +0300
-Subject: [PATCH] ANGLE WinRT: Call Trim() when application suspends
-
-This is required by Windows Store Apps to pass certification.
-
-Task-number: QTBUG-38481
-Change-Id: I6dc00431ee5f6c7d4c64111ccc38f46483d3b9a8
----
- .../src/libGLESv2/renderer/d3d11/Renderer11.cpp | 47 ++++++++++++++++++++++
- .../src/libGLESv2/renderer/d3d11/Renderer11.h | 15 +++++++
- 2 files changed, 62 insertions(+)
-
-diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/Renderer11.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/Renderer11.cpp
-index 2de477b..e70727c 100644
---- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/Renderer11.cpp
-+++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/Renderer11.cpp
-@@ -40,6 +40,13 @@
-
- #include "libEGL/Display.h"
-
-+#if defined(ANGLE_OS_WINRT) && !defined(ANGLE_OS_WINPHONE)
-+# include <dxgi1_3.h>
-+# include <wrl.h>
-+# include <windows.applicationmodel.core.h>
-+typedef ABI::Windows::Foundation::IEventHandler<ABI::Windows::ApplicationModel::SuspendingEventArgs *> SuspendEventHandler;
-+#endif
-+
- #ifdef _DEBUG
- // this flag enables suppressing some spurious warnings that pop up in certain WebGL samples
- // and conformance tests. to enable all warnings, remove this define.
-@@ -426,9 +433,49 @@ EGLint Renderer11::initialize()
- }
- }
-
-+#if defined(ANGLE_OS_WINRT) && !defined(ANGLE_OS_WINPHONE)
-+ // Monitor when the application suspends so that Trim() can be called
-+ Microsoft::WRL::ComPtr<ABI::Windows::ApplicationModel::Core::ICoreApplication> application;
-+ result = RoGetActivationFactory(Microsoft::WRL::Wrappers::HString::MakeReference(RuntimeClass_Windows_ApplicationModel_Core_CoreApplication).Get(),
-+ IID_PPV_ARGS(&application));
-+ if (FAILED(result))
-+ {
-+ ERR("Error obtaining CoreApplication: 0x%08X", result);
-+ return EGL_NOT_INITIALIZED;
-+ }
-+
-+ EventRegistrationToken cookie;
-+ result = application->add_Suspending(Microsoft::WRL::Callback<SuspendEventHandler>(this, &Renderer11::onSuspend).Get(), &cookie);
-+ if (FAILED(result))
-+ {
-+ ERR("Error setting suspend callback: 0x%08X", result);
-+ return EGL_NOT_INITIALIZED;
-+ }
-+#endif
-+
- return EGL_SUCCESS;
- }
-
-+#if defined(ANGLE_OS_WINRT) && !defined(ANGLE_OS_WINPHONE)
-+HRESULT Renderer11::onSuspend(IInspectable *, ABI::Windows::ApplicationModel::ISuspendingEventArgs *)
-+{
-+ if (!mDevice)
-+ return S_OK;
-+
-+ Microsoft::WRL::ComPtr<IDXGIDevice3> dxgiDevice;
-+ HRESULT result = mDevice->QueryInterface(IID_PPV_ARGS(&dxgiDevice));
-+ if (FAILED(result))
-+ {
-+ ERR("Error obtaining DXGIDevice3 on suspend: 0x%08X", result);
-+ return S_OK;
-+ }
-+
-+ dxgiDevice->Trim();
-+
-+ return S_OK;
-+}
-+#endif
-+
- // do any one-time device initialization
- // NOTE: this is also needed after a device lost/reset
- // to reset the scene status and ensure the default states are reset.
-diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/Renderer11.h b/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/Renderer11.h
-index a8a722c..773fc26 100644
---- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/Renderer11.h
-+++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/Renderer11.h
-@@ -18,6 +18,17 @@
- #include "libGLESv2/renderer/d3d11/InputLayoutCache.h"
- #include "libGLESv2/renderer/RenderTarget.h"
-
-+#if defined(ANGLE_OS_WINRT) && !defined(ANGLE_OS_WINPHONE)
-+struct IInspectable;
-+namespace ABI {
-+ namespace Windows {
-+ namespace ApplicationModel {
-+ struct ISuspendingEventArgs;
-+ }
-+ }
-+}
-+#endif
-+
- namespace gl
- {
- class Renderbuffer;
-@@ -202,6 +213,10 @@ class Renderer11 : public Renderer
- RenderTarget *drawRenderTarget, bool wholeBufferCopy);
- ID3D11Texture2D *resolveMultisampledTexture(ID3D11Texture2D *source, unsigned int subresource);
-
-+#if defined(ANGLE_OS_WINRT) && !defined(ANGLE_OS_WINPHONE)
-+ HRESULT onSuspend(IInspectable *, ABI::Windows::ApplicationModel::ISuspendingEventArgs *);
-+#endif
-+
- HMODULE mD3d11Module;
- HMODULE mDxgiModule;
-
---
-1.9.0.msysgit.0
-