From 2b083b7910818277f83dcdeee4f408a4d4e3ff09 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 22 Dec 2017 16:42:57 +0000
Subject: [PATCH] Add options for UI-configured SPIR-V disassemblers to shader
 viewer

---
 qrenderdoc/Windows/ShaderViewer.cpp | 35 +++++++++++++++++++++++++++--
 qrenderdoc/Windows/ShaderViewer.h   |  2 ++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp
index 6e268be0a..1a59457c2 100644
--- a/qrenderdoc/Windows/ShaderViewer.cpp
+++ b/qrenderdoc/Windows/ShaderViewer.cpp
@@ -311,7 +311,18 @@ void ShaderViewer::debugShader(const ShaderBindpointMapping *bind, const ShaderR
       GUIInvoke::call([this, targets, disasm]() {
         QStringList targetNames;
         for(const rdcstr &t : targets)
-          targetNames << t;
+        {
+          QString target = t;
+          targetNames << target;
+
+          // if we have a SPIR-V disassembly option, and the shader is natively SPIR-V, add our own
+          // SPIR-V disassemblers right after
+          if(target.contains(lit("SPIR-V")) && m_ShaderDetails->encoding == ShaderEncoding::SPIRV)
+          {
+            for(const SPIRVDisassembler &d : m_Ctx.Config().SPIRVDisassemblers)
+              targetNames << targetName(d);
+          }
+        }
 
         m_DisassemblyType->addItems(targetNames);
         m_DisassemblyType->setCurrentIndex(0);
@@ -856,7 +867,22 @@ void ShaderViewer::disassemble_typeChanged(int index)
   if(m_ShaderDetails == NULL)
     return;
 
-  QByteArray target = m_DisassemblyType->currentText().toUtf8();
+  QString targetStr = m_DisassemblyType->currentText();
+  QByteArray target = targetStr.toUtf8();
+
+  for(const SPIRVDisassembler &disasm : m_Ctx.Config().SPIRVDisassemblers)
+  {
+    if(targetStr == targetName(disasm))
+    {
+      QString result = disasm.DisassembleShader(this, m_ShaderDetails);
+
+      m_DisassemblyView->setReadOnly(false);
+      m_DisassemblyView->setText(result.toUtf8().data());
+      m_DisassemblyView->setReadOnly(true);
+      m_DisassemblyView->emptyUndoBuffer();
+      return;
+    }
+  }
 
   m_Ctx.Replay().AsyncInvoke([this, target](IReplayController *r) {
     rdcstr disasm = r->DisassembleShader(m_Pipeline, m_ShaderDetails, target.data());
@@ -1104,6 +1130,11 @@ RDTreeWidgetItem *ShaderViewer::makeResourceRegister(const Bindpoint &bind, uint
   }
 }
 
+QString ShaderViewer::targetName(const SPIRVDisassembler &disasm)
+{
+  return lit("SPIR-V (%1)").arg(disasm.name);
+}
+
 void ShaderViewer::addFileList()
 {
   QListWidget *list = new QListWidget(this);
diff --git a/qrenderdoc/Windows/ShaderViewer.h b/qrenderdoc/Windows/ShaderViewer.h
index c3ad1a911..0f5a1f57b 100644
--- a/qrenderdoc/Windows/ShaderViewer.h
+++ b/qrenderdoc/Windows/ShaderViewer.h
@@ -214,6 +214,8 @@ private:
   static const int INDICATOR_FINDRESULT = 0;
   static const int INDICATOR_REGHIGHLIGHT = 1;
 
+  QString targetName(const SPIRVDisassembler &disasm);
+
   void addFileList();
 
   ScintillaEdit *MakeEditor(const QString &name, const QString &text, int lang);