From e743c17f72ab332f7eb467f02dd9567f3f8d3de0 Mon Sep 17 00:00:00 2001 From: Yong He Date: Fri, 17 Jan 2025 08:56:23 -0800 Subject: Fix `-capability` arg in SPIRV debug command line output. (#6114) --- source/slang/slang-compiler-options.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'source') diff --git a/source/slang/slang-compiler-options.cpp b/source/slang/slang-compiler-options.cpp index 9b7091756..8a27f6fce 100644 --- a/source/slang/slang-compiler-options.cpp +++ b/source/slang/slang-compiler-options.cpp @@ -54,11 +54,21 @@ void CompilerOptionSet::writeCommandLineArgs(Session* globalSession, StringBuild switch (option.key) { case CompilerOptionName::Capability: - for (auto v : option.value) { - sb << " " << optionInfo.names << " " << v.stringValue; + StringBuilder subBuilder; + for (auto v : option.value) + { + if (subBuilder.getLength() != 0) + subBuilder << "+"; + if (v.kind == CompilerOptionValueKind::Int) + subBuilder << capabilityNameToString((CapabilityName)v.intValue); + else + subBuilder << v.stringValue; + } + if (subBuilder.getLength()) + sb << " " << optionInfo.names << " " << subBuilder.produceString(); + break; } - break; case CompilerOptionName::Include: for (auto v : option.value) { -- cgit v1.2.3