Merge m-c to inbound. a=merge
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 16 Jul 2015 12:45:32 -0400
changeset 253159 61101cfa98d2cdcee1f6582023cdd041adb4d02b
parent 253157 63ec4e50cb90205c4b1a74e29154e23b92e2e957 (current diff)
parent 253158 d8023b434e25beed6cb5d38b57d6bb27aaf888df (diff)
child 253160 19f222fd79fe6651e313b2361c19561027c091af
child 253262 a0f4a688433d5d8ef7468f9b41227b5a93cd2308
push id62369
push userryanvm@gmail.com
push dateThu, 16 Jul 2015 16:45:58 +0000
treeherdermozilla-inbound@61101cfa98d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to inbound. a=merge CLOSED TREE
gfx/thebes/gfxWindowsPlatform.cpp
old mode 100644
new mode 100755
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -2104,16 +2104,20 @@ gfxWindowsPlatform::InitD3D11Devices()
 
   if (status == D3D11Status::TryWARP || status == D3D11Status::ForceWARP) {
     if (!AttemptWARPDeviceCreation(featureLevels)) {
       // Nothing more we can do.
       return;
     }
   }
 
+  if (!mD3D11Device) {
+    return;
+  }
+
   mD3D11Device->SetExceptionMode(0);
 
   // We create our device for D2D content drawing here. Normally we don't use
   // D2D content drawing when using WARP. However when WARP is forced by
   // default we will let Direct2D use WARP as well.
   if (Factory::SupportsD2D1() && (!mIsWARP || (status == D3D11Status::ForceWARP))) {
     if (!AttemptD3D11ContentDeviceCreation(featureLevels)) {
       mD3D11ContentDevice = nullptr;