color spirv-val output (#3132)

* s/invalid code/todo

* comment debug disassembled spirv

* more convenient spirv-val output

* color spirv-val output

1 files changed, 6 insertions, 2 deletions

diff --git a/source/slang/slang-spirv-val.cpp b/source/slang/slang-spirv-val.cpp
index 29a4b8617..d41f0e8cc 100644
--- a/source/slang/slang-spirv-val.cpp
+++ b/source/slang/slang-spirv-val.cpp
@@ -8,6 +8,8 @@ static SlangResult disassembleSPIRV(const List<uint8_t>& spirv, String& outErr,
     // Set up our process
     CommandLine commandLine;
     commandLine.m_executableLocation.setName("spirv-dis");
+    commandLine.addArg("--comment");
+    commandLine.addArg("--color");
     RefPtr<Process> p;
 
     // If we failed to even start the process, then validation isn't available
@@ -75,9 +77,9 @@ SlangResult debugValidateSPIRV(const List<uint8_t>& spirv)
     fwrite(outData.getBuffer(), outData.getCount(), 1, stderr);
     outData.clear();
     SLANG_RETURN_ON_FAIL(StreamUtil::readAll(err, 0, outData));
-    fwrite(outData.getBuffer(), outData.getCount(), 1, stderr);
-    const auto ret = p->getReturnValue();
 
+    // If we failed, dump the spirv first.
+    const auto ret = p->getReturnValue();
     if(ret != 0)
     {
         String spirvDisErr;
@@ -87,6 +89,8 @@ SlangResult debugValidateSPIRV(const List<uint8_t>& spirv)
         fwrite(spirvDis.getBuffer(), spirvDis.getLength(), 1, stderr);
     }
 
+    fwrite(outData.getBuffer(), outData.getCount(), 1, stderr);
+
     return ret == 0 ? SLANG_OK : SLANG_FAIL;
 }