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. --- source/slang/slang-options.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'source/slang/slang-options.cpp') diff --git a/source/slang/slang-options.cpp b/source/slang/slang-options.cpp index 8a5c52e0e..9d9e8039b 100644 --- a/source/slang/slang-options.cpp +++ b/source/slang/slang-options.cpp @@ -407,21 +407,15 @@ void initCommandOptions(CommandOptions& options) { OptionKind::EnableEffectAnnotations, "-enable-effect-annotations", nullptr, "Enables support for legacy effect annotation syntax."}, -#if defined(SLANG_CONFIG_DEFAULT_SPIRV_DIRECT) { OptionKind::EmitSpirvViaGLSL, "-emit-spirv-via-glsl", nullptr, "Generate SPIR-V output by compiling generated GLSL with glslang" }, { OptionKind::EmitSpirvDirectly, "-emit-spirv-directly", nullptr, "Generate SPIR-V output direclty (default)" }, -#else - { OptionKind::EmitSpirvViaGLSL, "-emit-spirv-via-glsl", nullptr, - "Generate SPIR-V output by compiling generated GLSL with glslang (default)" }, - { OptionKind::EmitSpirvDirectly, "-emit-spirv-directly", nullptr, - "Generate SPIR-V output direclty rather than by compiling generated GLSL with glslang" }, { OptionKind::SPIRVCoreGrammarJSON, "-spirv-core-grammar", nullptr, "A path to a specific spirv.core.grammar.json to use when generating SPIR-V output" }, { OptionKind::IncompleteLibrary, "-incomplete-library", nullptr, "Allow generating code from incomplete libraries with unresolved external functions" }, -#endif + }; _addOptions(makeConstArrayView(targetOpts), options); -- cgit v1.2.3