Switch to direct-to-spirv backend as default. (#4002)

* Switch to direct-to-spirv backend as default.

* Fix slang-test.

* Fix.

* Fix.

3 files changed, 7 insertions, 5 deletions

diff --git a/tools/slang-test/options.cpp b/tools/slang-test/options.cpp
index 3fb71dd4a..895b7e2bb 100644
--- a/tools/slang-test/options.cpp
+++ b/tools/slang-test/options.cpp
@@ -290,9 +290,9 @@ static bool _isSubCommand(const char* arg)
         {
             optionsOut->skipApiDetection = true;
         }
-        else if (strcmp(arg, "-emit-spirv-directly") == 0)
+        else if (strcmp(arg, "-emit-spirv-via-glsl") == 0)
         {
-            optionsOut->emitSPIRVDirectly = true;
+            optionsOut->emitSPIRVDirectly = false;
         }
         else if (strcmp(arg, "-expected-failure-list") == 0)
         {
diff --git a/tools/slang-test/options.h b/tools/slang-test/options.h
index 398334e46..ae4d02234 100644
--- a/tools/slang-test/options.h
+++ b/tools/slang-test/options.h
@@ -115,7 +115,7 @@ struct Options
     // Maximum number of test servers to run.
     int serverCount = 1;
 
-    bool emitSPIRVDirectly = false;
+    bool emitSPIRVDirectly = true;
 
     Slang::HashSet<Slang::String> expectedFailureList;
 
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index eca103339..28e9e6e2e 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -2643,6 +2643,7 @@ static TestResult generateExpectedOutput(TestContext* const context, const TestI
             default:
             {
                 expectedCmdLine.addArg(filePath + ".glsl");
+                expectedCmdLine.addArg("-emit-spirv-via-glsl");
                 expectedCmdLine.addArg("-pass-through");
                 expectedCmdLine.addArg("glslang");
                 break;
@@ -2688,6 +2689,7 @@ TestResult generateActualOutput(TestContext* const context, const TestInput& inp
     CommandLine actualCmdLine;
     _initSlangCompiler(context, actualCmdLine);
     actualCmdLine.addArg(filePath);
+    actualCmdLine.addArg("-emit-spirv-via-glsl");
 
     const auto& args = input.testOptions->args;
 
@@ -3029,9 +3031,9 @@ static void _addRenderTestOptions(const Options& options, CommandLine& ioCmdLine
         ioCmdLine.addArg("-adapter");
         ioCmdLine.addArg(options.adapter);
     }
-    if (options.emitSPIRVDirectly)
+    if (!options.emitSPIRVDirectly)
     {
-        ioCmdLine.addArg("-emit-spirv-directly");
+        ioCmdLine.addArg("-emit-spirv-via-glsl");
     }
 }