зеркало из https://github.com/mozilla/gecko-dev.git
Don't use gfxWindowsPlatform in TextureD3D11. (bug 1316690 part 2, r=rhunt)
--HG-- extra : rebase_source : 62e07ec4ff9c5a2c882add956ac5755fb68f836b
This commit is contained in:
Родитель
d7f8e40664
Коммит
6550f2ab52
|
@ -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<ID3D11Device> dev = DeviceManagerDx::Get()->GetContentDevice();
|
||||
if (!dev) {
|
||||
if (gfxWindowsPlatform::GetPlatform()->DidRenderingDeviceReset()) {
|
||||
if (DeviceManagerDx::Get()->HasDeviceReset()) {
|
||||
return;
|
||||
}
|
||||
MOZ_CRASH("GFX: Invalid D3D11 content device");
|
||||
|
|
Загрузка…
Ссылка в новой задаче