Fix -capability arg in SPIRV debug command line output. (#6114)

shader-slang · Jan 17, 2025 · e743c17 · e743c17
1 parent 3666c66
commit e743c17
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git 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)
             {

diff --git a/tests/spirv/cmd-arg-debug-info.slang b/tests/spirv/cmd-arg-debug-info.slang
@@ -0,0 +1,5 @@
+//TEST:SIMPLE(filecheck=CHECK): -target spirv -g3 -emit-spirv-directly -profile sm_6_6+spirv_1_5
+// CHECK:  OpString "-target spirv {{.*}} -capability spirv_1_5
+[numthreads(1,1,1)]
+void computeMain()
+{}