Bug 1149761 - Don't MOZ_CRASH if WARP fails. r=bas, a=lmandel
authorMilan Sreckovic <milan@mozilla.com>
Thu, 02 Apr 2015 15:09:09 -0400
changeset 258218 cf2036567077
parent 258217 25d2e5abebec
child 258219 c4e7a4be6f63
push id4622
push userryanvm@gmail.com
push date2015-04-02 21:26 +0000
treeherdermozilla-beta@d7bbef9132a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbas, lmandel
bugs1149761
milestone38.0
Bug 1149761 - Don't MOZ_CRASH if WARP fails. r=bas, a=lmandel
gfx/thebes/gfxWindowsPlatform.cpp
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -1902,17 +1902,17 @@ gfxWindowsPlatform::InitD3D11Devices()
                            // to prevent bug 1092260. IE 11 also uses this flag.
                            D3D11_CREATE_DEVICE_BGRA_SUPPORT,
                            featureLevels.Elements(), featureLevels.Length(),
                            D3D11_SDK_VERSION, byRef(mD3D11Device), nullptr, nullptr);
 
     if (FAILED(hr)) {
       // This should always succeed... in theory.
       gfxCriticalError() << "Failed to initialize WARP D3D11 device!" << hr;
-      MOZ_CRASH();
+      return;
     }
 
     mIsWARP = true;
     reporterWARP.SetSuccessful();
   }
 
   mD3D11Device->SetExceptionMode(0);