Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a startup crash when attempting to test D3D11 texture sharing. (bug 1170211, r=jmuizelaar, a=KWierso)

Browse Source
This commit is contained in:
David Anderson 2015-06-01 15:45:19 -07:00
parent 43ebdcc02c
commit 4a50d5c15e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/thebes/gfxWindowsPlatform.cpp
View File

@ -532,9 +532,7 @@ gfxWindowsPlatform::UpdateRenderMode()
}
ID3D11Device *device = GetD3D11Device();
if (isVistaOrHigher && !InSafeMode() && tryD2D &&
device &&
device->GetFeatureLevel() >= D3D_FEATURE_LEVEL_10_0 &&
if (isVistaOrHigher && !InSafeMode() && tryD2D && device &&
DoesD3D11TextureSharingWork(device)) {
VerifyD2DDevice(d2dForceEnabled);
@ -1737,6 +1735,12 @@ bool DoesD3D11DeviceWork(ID3D11Device *device)
// with E_OUTOFMEMORY.
bool DoesD3D11TextureSharingWorkInternal(ID3D11Device *device, DXGI_FORMAT format, UINT bindflags)
{
// CreateTexture2D is known to crash on lower feature levels, see bugs
// 1170211 and 1089413.
if (device->GetFeatureLevel() < D3D_FEATURE_LEVEL_10_0) {
return false;
}
if (gfxPrefs::Direct2DForceEnabled() ||
gfxPrefs::LayersAccelerationForceEnabled())
{