From 8bf7d112f96f349286f702a10c5892ef63595f0a Mon Sep 17 00:00:00 2001 From: Yong He Date: Wed, 12 Jun 2024 09:53:44 -0700 Subject: Fix merge error. (#4358) --- source/slang/slang-options.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source') diff --git a/source/slang/slang-options.cpp b/source/slang/slang-options.cpp index bcf9256bb..ec37223bd 100644 --- a/source/slang/slang-options.cpp +++ b/source/slang/slang-options.cpp @@ -351,7 +351,7 @@ void initCommandOptions(CommandOptions& options) { OptionKind::SourceEmbedLanguage, "-source-embed-language", "-source-embed-language ", "The language to be used for source embedding. Defaults to C/C++. Currently only C/C++ are supported"}, { OptionKind::DisableShortCircuit, "-disable-short-circuit", nullptr, "Disable short-circuiting for \"&&\" and \"||\" operations" }, - { OptionKind::UnscopedEnum, "-unscoped-enum", nullptr, "Treat enums types as unscoped by default."} + { OptionKind::UnscopedEnum, "-unscoped-enum", nullptr, "Treat enums types as unscoped by default."}, { OptionKind::PreserveParameters, "-preserve-params", nullptr, "Preserve all resource parameters in the output code, even if they are not used by the shader."} }; -- cgit v1.2.3