summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong He <yonghe@outlook.com>2024-06-12 09:53:44 -0700
committerGitHub <noreply@github.com>2024-06-12 09:53:44 -0700
commit8bf7d112f96f349286f702a10c5892ef63595f0a (patch)
treed31a3596b84046e176bbb86c9f4b77a93eafb750
parentb7e824347a5de25cc013af30e43bd405b8b5698f (diff)
Fix merge error. (#4358)
-rw-r--r--source/slang/slang-options.cpp2
1 files changed, 1 insertions, 1 deletions
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 <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."}
};