Factor out createWARPDevice and add RAII wrapper for WARP dll.

Author: alsepkow

tools/clang/unittests/HLSLExec/HlslExecTestUtils.cpp

@@ -77,6 +77,76 @@ static UINT getD3D12SDKVersion(std::wstring SDKPath) {
   return SDKVersion;
 }
 
+// RAII wrapper for WARP DLL loading
+class WarpDllLoader {
+public:
+  WarpDllLoader() = default;
+  
+  ~WarpDllLoader() {
+    Close();
+  }
+  
+  // Non-copyable
+  WarpDllLoader(const WarpDllLoader&) = delete;
+  WarpDllLoader& operator=(const WarpDllLoader&) = delete;
+  
+  void LoadWarpDll() {
+    WEX::Common::String WarpDllPath;
+    if (SUCCEEDED(WEX::TestExecution::RuntimeParameters::TryGetValue(
+            L"WARP_DLL", WarpDllPath))) {
+      LogCommentFmt(L"WARP_DLL requested: %ls", (const wchar_t *)WarpDllPath);
+      Module = LoadLibraryExW(WarpDllPath, NULL, 0);
+      VERIFY_WIN32_BOOL_SUCCEEDED(!!Module);
+    }
+  }
+  
+  void Close() {
+    if (Module) {
+      FreeLibrary(Module);
+      Module = NULL;
+    }
+  }
+  
+private:
+  HMODULE Module = NULL;
+};
+
+// Helper function to create WARP device with proper DLL management
+static bool createWARPDevice(
+    IDXGIFactory4* DXGIFactory,
+    std::function<HRESULT(IUnknown *, D3D_FEATURE_LEVEL, REFIID, void **)> CreateDeviceFn,
+    ID3D12Device** D3DDeviceCom,
+    bool SkipUnsupported) {
+  
+  // Load WARP DLL if specified
+  WarpDllLoader warpLoader;
+  warpLoader.LoadWarpDll();
+  
+  // Create the WARP device
+  CComPtr<IDXGIAdapter> WarpAdapter;
+  VERIFY_SUCCEEDED(DXGIFactory->EnumWarpAdapter(IID_PPV_ARGS(&WarpAdapter)));
+  HRESULT CreateHR = CreateDeviceFn(WarpAdapter, D3D_FEATURE_LEVEL_11_0,
+                                    IID_PPV_ARGS(D3DDeviceCom));
+  if (FAILED(CreateHR)) {
+    LogCommentFmt(L"Failed to create WARP device: 0x%08x", CreateHR);
+
+    if (SkipUnsupported)
+      WEX::Logging::Log::Result(WEX::Logging::TestResults::Skipped);
+
+    return false;
+  }
+  
+  // Log the actual version of WARP that's loaded
+  if (GetModuleHandleW(L"d3d10warp.dll") != NULL) {
+    WCHAR FullModuleFilePath[MAX_PATH] = L"";
+    GetModuleFileNameW(GetModuleHandleW(L"d3d10warp.dll"), FullModuleFilePath,
+                       sizeof(FullModuleFilePath));
+    LogCommentFmt(L"WARP driver loaded from: %ls", FullModuleFilePath);
+  }
+  
+  return true;
+}
+
 static bool createDevice(
     ID3D12Device **D3DDevice, D3D_SHADER_MODEL TestModel, bool SkipUnsupported,
     std::function<HRESULT(IUnknown *, D3D_FEATURE_LEVEL, REFIID, void **)>
@@ -104,61 +174,9 @@ static bool createDevice(
 
   VERIFY_SUCCEEDED(CreateDXGIFactory1(IID_PPV_ARGS(&DXGIFactory)));
   if (GetTestParamUseWARP(useWarpByDefault())) {
-    // The WARP_DLL runtime parameter can be used to specify a specific DLL to
-    // load.  To force this to be used, we make sure that this DLL is loaded
-    // before attempting to create the device.
-
-    struct WarpDll {
-      HMODULE Module = NULL; // NOLINT
-
-      ~WarpDll() { Close(); }
-
-      void Close() {
-        if (Module) {
-          FreeLibrary(Module);
-          Module = NULL;
-        }
-      }
-    };
-
-    WarpDll ExplicitlyLoadedWarpDll;
-    WEX::Common::String WarpDllPath;
-    if (SUCCEEDED(WEX::TestExecution::RuntimeParameters::TryGetValue(
-            L"WARP_DLL", WarpDllPath))) {
-      WEX::Logging::Log::Comment(WEX::Common::String().Format(
-          L"WARP_DLL requested: %ls", (const wchar_t *)WarpDllPath));
-      ExplicitlyLoadedWarpDll.Module = LoadLibraryExW(WarpDllPath, NULL, 0);
-      VERIFY_WIN32_BOOL_SUCCEEDED(!!ExplicitlyLoadedWarpDll.Module);
-    }
-
-    // Create the WARP device
-    CComPtr<IDXGIAdapter> WarpAdapter;
-    VERIFY_SUCCEEDED(DXGIFactory->EnumWarpAdapter(IID_PPV_ARGS(&WarpAdapter)));
-    HRESULT CreateHR = CreateDeviceFn(WarpAdapter, D3D_FEATURE_LEVEL_11_0,
-                                      IID_PPV_ARGS(&D3DDeviceCom));
-    if (FAILED(CreateHR)) {
-      LogCommentFmt(L"Failed to create WARP device: 0x%08x", CreateHR);
-
-      if (SkipUnsupported)
-        WEX::Logging::Log::Result(WEX::Logging::TestResults::Skipped);
-
+    if (!createWARPDevice(DXGIFactory, CreateDeviceFn, &D3DDeviceCom, SkipUnsupported)) {
       return false;
     }
-
-    // Now that the WARP device is created we can release our reference to the
-    // warp dll.
-    ExplicitlyLoadedWarpDll.Close();
-
-    // Log the actual version of WARP that's loaded so we can be sure that
-    // we're using the version we think.
-    if (GetModuleHandleW(L"d3d10warp.dll") != NULL) {
-      WCHAR FullModuleFilePath[MAX_PATH] = L"";
-      GetModuleFileNameW(GetModuleHandleW(L"d3d10warp.dll"), FullModuleFilePath,
-                         sizeof(FullModuleFilePath));
-      WEX::Logging::Log::Comment(WEX::Common::String().Format(
-          L"WARP driver loaded from: %ls", FullModuleFilePath));
-    }
-
   } else {
     CComPtr<IDXGIAdapter1> HardwareAdapter;
     WEX::Common::String AdapterValue;
@@ -167,8 +185,7 @@ static bool createDevice(
     if (SUCCEEDED(HR))
       st::GetHardwareAdapter(DXGIFactory, AdapterValue, &HardwareAdapter);
     else
-      WEX::Logging::Log::Comment(
-          L"Using default hardware adapter with D3D12 support.");
+      LogCommentFmt(L"Using default hardware adapter with D3D12 support.");
 
     VERIFY_SUCCEEDED(CreateDeviceFn(HardwareAdapter, D3D_FEATURE_LEVEL_11_0,
                                     IID_PPV_ARGS(&D3DDeviceCom)));