Bug 1144900: Fix windows gfx out of memory assertion. r=Bas

--HG--
extra : rebase_source : 1158df9324b3a1f30f7a446d7713ca17ad26a5fb
This commit is contained in:
Dave Townsend 2015-03-19 10:42:27 -07:00
Родитель ab8b316059
Коммит 699c63e7d4
3 изменённых файлов: 7 добавлений и 2 удалений

Просмотреть файл

@ -166,7 +166,8 @@ enum class DeviceResetReason
REMOVED,
RESET,
DRIVER_ERROR,
INVALID_CALL
INVALID_CALL,
OUT_OF_MEMORY
};
class gfxPlatform {

Просмотреть файл

@ -1168,6 +1168,10 @@ gfxWindowsPlatform::DidRenderingDeviceReset(DeviceResetReason* aResetReason)
break;
case DXGI_ERROR_INVALID_CALL:
*aResetReason = DeviceResetReason::INVALID_CALL;
break;
case E_OUTOFMEMORY:
*aResetReason = DeviceResetReason::OUT_OF_MEMORY;
break;
default:
MOZ_ASSERT(false);
}

Просмотреть файл

@ -214,7 +214,7 @@
"expires_in_version": "never",
"kind": "enumerated",
"n_values": 10,
"description": "GPU Device Reset Reason (ok, hung, removed, reset, internal error, invalid call)"
"description": "GPU Device Reset Reason (ok, hung, removed, reset, internal error, invalid call, out of memory)"
},
"FORGET_SKIPPABLE_MAX": {
"expires_in_version": "never",