summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/angle
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/angle')
-rw-r--r--src/3rdparty/angle/src/libGLESv2/renderer/d3d11/Renderer11.cpp47
-rw-r--r--src/3rdparty/angle/src/libGLESv2/renderer/d3d11/Renderer11.h15
2 files changed, 62 insertions, 0 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/Renderer11.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/Renderer11.cpp
index 2de477b3bc..e70727c65e 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 a8a722c56c..773fc26db1 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;