2 files changed, 49 insertions, 27 deletions

diff --git a/tools/gfx/render-d3d11.cpp b/tools/gfx/render-d3d11.cpp
index 6ce482c6f..b0b2b9c04 100644
--- a/tools/gfx/render-d3d11.cpp
+++ b/tools/gfx/render-d3d11.cpp
@@ -458,35 +458,44 @@ SlangResult D3D11Renderer::initialize(const Desc& desc, void* inWindowHandle)
     // `D3D11CreateDeviceAndSwapChain` up to twice: the first time with 11_1
     // at the start of the list of requested feature levels, and the second
     // time without it.
+    // 
+    // We first try create using hardware and then software (reference) driver
+    // Test until we get a successful result
 
-    for (int ii = 0; ii < 2; ++ii)
-    {
-        const HRESULT hr = D3D11CreateDeviceAndSwapChain_(
-            nullptr,                    // adapter (use default)
-            D3D_DRIVER_TYPE_REFERENCE,
-//            D3D_DRIVER_TYPE_HARDWARE,
-            nullptr,                    // software
-            deviceFlags,
-            &featureLevels[ii],
-            totalNumFeatureLevels - ii,
-            D3D11_SDK_VERSION,
-            &swapChainDesc,
-            m_swapChain.writeRef(),
-            m_device.writeRef(),
-            &featureLevel,
-            m_immediateContext.writeRef());
-
-        // Failures with `E_INVALIDARG` might be due to feature level 11_1
-        // not being supported.
-        if (hr == E_INVALIDARG)
+    {
+        Result res = SLANG_FAIL;
+        for (int ii = 0; ii < 4; ++ii)
+        {
+            const D3D_DRIVER_TYPE driverType = (ii & 2) ? D3D_DRIVER_TYPE_REFERENCE : D3D_DRIVER_TYPE_HARDWARE;
+            const int startFeatureIndex = (ii & 1);
+
+            res = D3D11CreateDeviceAndSwapChain_(
+                nullptr,                    // adapter (use default)
+                driverType,
+                nullptr,                    // software
+                deviceFlags,
+                &featureLevels[startFeatureIndex],
+                totalNumFeatureLevels - startFeatureIndex,
+                D3D11_SDK_VERSION,
+                &swapChainDesc,
+                m_swapChain.writeRef(),
+                m_device.writeRef(),
+                &featureLevel,
+                m_immediateContext.writeRef());
+
+            // Check if successfully constructed - if so we are done. 
+            if (SLANG_SUCCEEDED(res))
+            {
+                break;
+            }
+        }
+        // If res is failure, means all styles have have failed, and so initialization fails.
+        if (SLANG_FAILED(res))
         {
-            continue;
+            return res;
         }
-
-        // Other failures are real, though.
-        SLANG_RETURN_ON_FAIL(hr);
-        // We must have a swap chain
-        break;
+        // Check we have a swap chain, context and device
+        SLANG_ASSERT(m_immediateContext && m_swapChain && m_device);
     }
 
     // TODO: Add support for debugging to help detect leaks:
diff --git a/tools/render-test/main.cpp b/tools/render-test/main.cpp
index 9dfcbe29e..93de67907 100644
--- a/tools/render-test/main.cpp
+++ b/tools/render-test/main.cpp
@@ -489,11 +489,24 @@ SlangResult innerMain(int argc, char** argv)
 			return SLANG_FAIL;
 	}
 
+    if (!renderer)
+    {
+        fprintf(stderr, "Unable to create renderer\n");
+        return SLANG_FAIL;
+    }
+
     Renderer::Desc desc;
     desc.width = gWindowWidth;
     desc.height = gWindowHeight;
 
-	SLANG_RETURN_ON_FAIL(renderer->initialize(desc, windowHandle));
+    {
+        Result res = renderer->initialize(desc, windowHandle);
+        if (SLANG_FAILED(res))
+        {
+            fprintf(stderr, "Unable to initialize renderer\n");
+            return res;
+        }
+    }
 
     ShaderCompiler shaderCompiler;
     shaderCompiler.renderer = renderer;