Some fix-up post re-base to resolve merge conflicts related to coop vec

tests.

Author: alsepkow

tools/clang/unittests/HLSLExec/ExecutionTest.cpp

@@ -471,6 +471,8 @@ class ExecutionTest {
   dxc::DxcDllSupport m_support;
 
   bool m_D3DInitCompleted = false;
+  bool m_ExperimentalModeEnabled = false;
+  bool m_AgilitySDKEnabled = false;
 
   const float ClearColor[4] = {0.0f, 0.2f, 0.4f, 1.0f};
 
@@ -10318,18 +10320,16 @@ struct CoopVecExperimentalModeHelper {
       : HadExperimentalShaderModels(HadExperimentalShaderModels) {
     // Enable experimental features
     UUID Features[] = {D3D12CooperativeVectorExperiment};
-    if (FAILED(ExecutionTest::EnableExperimentalShaderModels(
-            Features, _countof(Features)))) {
+    if (FAILED(EnableExperimentalShaderModels(Features, _countof(Features)))) {
       VERIFY_FAIL(L"Failed to enable experimental features");
     }
   }
 
   ~CoopVecExperimentalModeHelper() {
     if (HadExperimentalShaderModels) {
-      ExecutionTest::EnableExperimentalShaderModels(
-          reinterpret_cast<UUID *>(nullptr), 0);
+      EnableExperimentalShaderModels(reinterpret_cast<UUID *>(nullptr), 0);
     } else {
-      ExecutionTest::DisableExperimentalShaderModels();
+      DisableExperimentalShaderModels();
     }
   }
 };

tools/clang/unittests/HLSLExec/HlslExecTestUtils.h

@@ -252,21 +252,52 @@ static HRESULT EnableAgilitySDK(HMODULE Runtime, UINT SDKVersion,
   return ExperimentalFeaturesFunc(0, nullptr, nullptr, nullptr);
 }
 
-static HRESULT EnableExperimentalShaderModels(HMODULE Runtime) {
-  D3D12EnableExperimentalFeaturesFn func =
+static HRESULT
+EnableExperimentalShaderModels(HMODULE hRuntime,
+                               UUID AdditionalFeatures[] = nullptr,
+                               size_t NumAdditionalFeatures = 0) {
+  D3D12EnableExperimentalFeaturesFn pD3D12EnableExperimentalFeatures =
       (D3D12EnableExperimentalFeaturesFn)GetProcAddress(
-          Runtime, "D3D12EnableExperimentalFeatures");
-  if (func == nullptr) {
+          hRuntime, "D3D12EnableExperimentalFeatures");
+  if (pD3D12EnableExperimentalFeatures == nullptr) {
     return HRESULT_FROM_WIN32(GetLastError());
   }
-  return func(1, &D3D12ExperimentalShaderModelsID, nullptr, nullptr);
+
+  std::vector<UUID> Features;
+
+  Features.push_back(D3D12ExperimentalShaderModels);
+
+  if (AdditionalFeatures != nullptr && NumAdditionalFeatures > 0) {
+    Features.insert(Features.end(), AdditionalFeatures,
+                    AdditionalFeatures + NumAdditionalFeatures);
+  }
+
+  return pD3D12EnableExperimentalFeatures((UINT)Features.size(),
+                                          Features.data(), nullptr, nullptr);
 }
 
-static HRESULT EnableExperimentalShaderModels() {
-  HMODULE Runtime = LoadLibraryW(L"d3d12.dll");
-  if (Runtime == NULL)
+static HRESULT
+EnableExperimentalShaderModels(UUID AdditionalFeatures[] = nullptr,
+                               size_t NumAdditionalFeatures = 0) {
+  HMODULE hRuntime = LoadLibraryW(L"d3d12.dll");
+  if (hRuntime == NULL)
     return E_FAIL;
-  return EnableExperimentalShaderModels(Runtime);
+  return EnableExperimentalShaderModels(hRuntime, AdditionalFeatures,
+                                        NumAdditionalFeatures);
+}
+
+static HRESULT DisableExperimentalShaderModels() {
+  HMODULE hRuntime = LoadLibraryW(L"d3d12.dll");
+  if (hRuntime == NULL)
+    return E_FAIL;
+
+  D3D12EnableExperimentalFeaturesFn pD3D12EnableExperimentalFeatures =
+      (D3D12EnableExperimentalFeaturesFn)GetProcAddress(
+          hRuntime, "D3D12EnableExperimentalFeatures");
+  if (pD3D12EnableExperimentalFeatures == nullptr) {
+    return HRESULT_FROM_WIN32(GetLastError());
+  }
+  return pD3D12EnableExperimentalFeatures(0, nullptr, nullptr, nullptr);
 }
 
 static HRESULT EnableAgilitySDK(HMODULE Runtime) {