Refactor CreateDevice error checking.

src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp

@@ -353,37 +353,41 @@ egl::Error Renderer11::initialize()
                                    &mDeviceContext);
 
         // Cleanup done by destructor
-
-        // Most likely error codes, see
-        // https://msdn.microsoft.com/en-us/library/windows/desktop/ff476082%28v=vs.85%29.aspx
-        // And https://msdn.microsoft.com/en-us/library/windows/desktop/ff476174(v=vs.85).aspx
-        switch (result)
-        {
-          case E_INVALIDARG:
-            return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_INVALIDARG);
-          case E_FAIL:
-            return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_FAIL);
-          case E_NOTIMPL:
-            return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_NOTIMPL);
-          case E_OUTOFMEMORY:
-            return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_OUTOFMEMORY);
-          case DXGI_ERROR_INVALID_CALL:
-            return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_INVALIDCALL);
-          case DXGI_ERROR_SDK_COMPONENT_MISSING:
-            return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_COMPONENTMISSING);
-          case DXGI_ERROR_WAS_STILL_DRAWING:
-            return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_WASSTILLDRAWING);
-          case DXGI_ERROR_NOT_CURRENTLY_AVAILABLE:
-            return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_NOTAVAILABLE);
-          case DXGI_ERROR_DEVICE_HUNG:
-            return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_DEVICEHUNG);
-          default:
-            if (!mDevice || FAILED(result))
+        if (FAILED(result))
+        {
+            // Most likely error codes, see
+            // https://msdn.microsoft.com/en-us/library/windows/desktop/ff476082%28v=vs.85%29.aspx
+            // And https://msdn.microsoft.com/en-us/library/windows/desktop/ff476174(v=vs.85).aspx
+            switch (result)
             {
+              case E_INVALIDARG:
+                return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_INVALIDARG);
+              case E_FAIL:
+                return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_FAIL);
+              case E_NOTIMPL:
+                return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_NOTIMPL);
+              case E_OUTOFMEMORY:
+                return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_OUTOFMEMORY);
+              case DXGI_ERROR_INVALID_CALL:
+                return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_INVALIDCALL);
+              case DXGI_ERROR_SDK_COMPONENT_MISSING:
+                return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_COMPONENTMISSING);
+              case DXGI_ERROR_WAS_STILL_DRAWING:
+                return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_WASSTILLDRAWING);
+              case DXGI_ERROR_NOT_CURRENTLY_AVAILABLE:
+                return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_NOTAVAILABLE);
+              case DXGI_ERROR_DEVICE_HUNG:
+                return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_DEVICEHUNG);
+              default:
                 return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_ERROR);
             }
         }
 
+        if (!mDevice)
+        {
+            return GenerateD3D11CreateDeviceErr(D3D11_INIT_CREATEDEVICE_NULL);
+        }
+
         double createDeviceSec = ANGLEPlatformCurrent()->currentTime() - createDeviceBegin;
         int createDeviceMS = static_cast<int>(createDeviceSec * 1000);
         ANGLE_HISTOGRAM_TIMES("GPU.ANGLE.D3D11CreateDeviceMS", createDeviceMS);

src/libANGLE/renderer/d3d/d3d11/Renderer11.h

@@ -78,6 +78,8 @@ enum D3D11InitError
     D3D11_INIT_CREATEDEVICE_NOTAVAILABLE,
     // CreateDevice returned DXGI_ERROR_DEVICE_HUNG
     D3D11_INIT_CREATEDEVICE_DEVICEHUNG,
+    // CreateDevice returned NULL
+    D3D11_INIT_CREATEDEVICE_NULL,
     NUM_D3D11_INIT_ERRORS
 };