From 6550f2ab5298e0c27d30536f90b28da8310c5078 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 11 Nov 2016 11:58:46 -0800 Subject: [PATCH] Don't use gfxWindowsPlatform in TextureD3D11. (bug 1316690 part 2, r=rhunt) --HG-- extra : rebase_source : 62e07ec4ff9c5a2c882add956ac5755fb68f836b --- gfx/layers/d3d11/TextureD3D11.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gfx/layers/d3d11/TextureD3D11.cpp b/gfx/layers/d3d11/TextureD3D11.cpp index 21d66197c947..382702643c03 100644 --- a/gfx/layers/d3d11/TextureD3D11.cpp +++ b/gfx/layers/d3d11/TextureD3D11.cpp @@ -1212,7 +1212,7 @@ SyncObjectD3D11::FinalizeFrame() if (FAILED(hr) || !mD3D11Texture) { gfxCriticalError() << "Failed to D3D11 OpenSharedResource for frame finalization: " << hexa(hr); - if (gfxWindowsPlatform::GetPlatform()->DidRenderingDeviceReset()) { + if (DeviceManagerDx::Get()->HasDeviceReset()) { return; } @@ -1238,7 +1238,7 @@ SyncObjectD3D11::FinalizeFrame() AutoTextureLock(mutex, hr, 20000); if (hr == WAIT_TIMEOUT) { - if (gfxWindowsPlatform::GetPlatform()->DidRenderingDeviceReset()) { + if (DeviceManagerDx::Get()->HasDeviceReset()) { gfxWarning() << "AcquireSync timed out because of device reset."; return; } @@ -1251,7 +1251,7 @@ SyncObjectD3D11::FinalizeFrame() RefPtr dev = DeviceManagerDx::Get()->GetContentDevice(); if (!dev) { - if (gfxWindowsPlatform::GetPlatform()->DidRenderingDeviceReset()) { + if (DeviceManagerDx::Get()->HasDeviceReset()) { return; } MOZ_CRASH("GFX: Invalid D3D11 content device");