render-test: Change D3D12 default to sm_6_5 (#8320)

Changes default for render-test to sm_6_5.
Since sm_6_5 is the new default, remove the -use-dxil option, add
-use-dxcb option
Remove -use-dxil option from all test cases.
Add -use-dxcb to two tests that needed it.

Fixes #7611

4 files changed, 17 insertions, 16 deletions

diff --git a/tools/render-test/options.cpp b/tools/render-test/options.cpp
index e4163b312..120e03456 100644
--- a/tools/render-test/options.cpp
+++ b/tools/render-test/options.cpp
@@ -154,9 +154,9 @@ static rhi::DeviceType _toRenderType(Slang::RenderApiType apiType)
         {
             outOptions.shaderType = ShaderProgramType::GraphicsTaskMeshCompute;
         }
-        else if (argValue == "-use-dxil")
+        else if (argValue == "-use-dxbc")
         {
-            outOptions.useDXIL = true;
+            outOptions.useDXBC = true;
         }
         else if (argValue == "-skip-spirv-validation")
         {
diff --git a/tools/render-test/options.h b/tools/render-test/options.h
index ff938e8c4..49e05c440 100644
--- a/tools/render-test/options.h
+++ b/tools/render-test/options.h
@@ -64,7 +64,8 @@ struct Options
 
     bool outputUsingType = false;
 
-    bool useDXIL = false;
+    bool useDXBC = false;
+
     bool onlyStartup = false;
 
     bool performanceProfile = false;
diff --git a/tools/render-test/render-test-main.cpp b/tools/render-test/render-test-main.cpp
index af0415bd0..991d60683 100644
--- a/tools/render-test/render-test-main.cpp
+++ b/tools/render-test/render-test-main.cpp
@@ -1364,16 +1364,16 @@ static SlangResult _innerMain(
         break;
 
     case DeviceType::D3D12:
-        input.target = SLANG_DXBC;
-        input.profile = "sm_5_0";
+        input.target = SLANG_DXIL;
+        input.profile = "sm_6_5";
         nativeLanguage = SLANG_SOURCE_LANGUAGE_HLSL;
-        slangPassThrough = SLANG_PASS_THROUGH_FXC;
+        slangPassThrough = SLANG_PASS_THROUGH_DXC;
 
-        if (options.useDXIL)
+        if (options.useDXBC)
         {
-            input.target = SLANG_DXIL;
-            input.profile = "sm_6_5";
-            slangPassThrough = SLANG_PASS_THROUGH_DXC;
+            input.target = SLANG_DXBC;
+            input.profile = "sm_5_0";
+            slangPassThrough = SLANG_PASS_THROUGH_FXC;
         }
         break;
 
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index 6c0de13ec..351875aeb 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -1159,7 +1159,7 @@ static SlangResult _extractRenderTestRequirements(
     // That a similar logic has to be kept inside the implementation of render-test and both this
     // and render-test will have to be kept in sync.
 
-    bool useDxil = cmdLine.findArgIndex(UnownedStringSlice::fromLiteral("-use-dxil")) >= 0;
+    bool useDxbc = cmdLine.findArgIndex(UnownedStringSlice::fromLiteral("-use-dxbc")) >= 0;
 
     bool usePassthru = false;
 
@@ -1226,13 +1226,13 @@ static SlangResult _extractRenderTestRequirements(
         passThru = SLANG_PASS_THROUGH_FXC;
         break;
     case RenderApiType::D3D12:
-        target = SLANG_DXBC;
+        target = SLANG_DXIL;
         nativeLanguage = SLANG_SOURCE_LANGUAGE_HLSL;
-        passThru = SLANG_PASS_THROUGH_FXC;
-        if (useDxil)
+        passThru = SLANG_PASS_THROUGH_DXC;
+        if (useDxbc)
         {
-            target = SLANG_DXIL;
-            passThru = SLANG_PASS_THROUGH_DXC;
+            target = SLANG_DXBC;
+            passThru = SLANG_PASS_THROUGH_FXC;
         }
         break;
     case RenderApiType::Vulkan: