From f1de1817ca10e34ec6a844100f10f0de3340c9f2 Mon Sep 17 00:00:00 2001 From: Yong He Date: Tue, 23 Apr 2024 12:14:21 -0700 Subject: Switch to direct-to-spirv backend as default. (#4002) * Switch to direct-to-spirv backend as default. * Fix slang-test. * Fix. * Fix. --- tools/slang-test/slang-test-main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tools/slang-test/slang-test-main.cpp') 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"); } } -- cgit v1.2.3