lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-23 06:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow for configuring multiple SPIR-V disassemblers, detect known tools

Browse Source 
* Initially add support for spirv-cross and spirv-dis.
* When possible we'll auto-detect the tools in path or in the build's
  plugins folder.  Otherwise the user can add it and add their
  executable path.
* We still use the first disassembler for editing - in future it would
  be good to allow selecting the disassembler at edit time (as well
  as allowing multiple compilers).
This commit is contained in:
baldurk
2018-01-17 21:07:04 +00:00
parent 2354a0e71d
commit be0681f770
6 changed files with 411 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/Interface/SPIRVDisassembler.cpp
+29 -4
View File
@@ -1,4 +1,4 @@
#/******************************************************************************
/******************************************************************************
* The MIT License (MIT)
*
* Copyright (c) 2016-2018 Baldur Karlsson
@@ -27,6 +27,18 @@
#include "Code/QRDUtils.h"
#include "QRDInterface.h"
template <>
std::string DoStringise(const KnownSPIRVTool &el)
{
BEGIN_ENUM_STRINGISE(KnownSPIRVTool);
{
STRINGISE_ENUM_CLASS_NAMED(Unknown, "Custom Tool");
STRINGISE_ENUM_CLASS_NAMED(SPIRV_Cross, "SPIRV-Cross");
STRINGISE_ENUM_CLASS_NAMED(spirv_dis, "spirv-dis");
}
END_ENUM_STRINGISE();
}
rdcstr SPIRVDisassembler::DisassembleShader(QWidget *window, const ShaderReflection *shaderDetails) const
{
if(executable.isEmpty())
@@ -50,7 +62,20 @@ rdcstr SPIRVDisassembler::DisassembleShader(QWidget *window, const ShaderReflect
return "";
}
if(!QString(args).contains(lit("{spv_bin}")))
QString programArguments = args;
switch(tool)
{
case KnownSPIRVTool::SPIRV_Cross:
programArguments = lit("--output {spv_disas} {spv_bin} --vulkan-semantics");
break;
case KnownSPIRVTool::spirv_dis:
programArguments = lit("--no-color -o {spv_disas} {spv_bin}");
break;
default: break;
}
if(!programArguments.contains(lit("{spv_bin}")))
{
RDDialog::critical(
window, QApplication::translate("SPIRVDisassembler", "Wrongly configured disassembler"),
@@ -62,10 +87,10 @@ rdcstr SPIRVDisassembler::DisassembleShader(QWidget *window, const ShaderReflect
QString glsl;
LambdaThread *thread = new LambdaThread([this, window, &glsl, spv_bin_file]() {
LambdaThread *thread = new LambdaThread([this, window, &glsl, programArguments, spv_bin_file]() {
QString spv_disas_file = QDir(QDir::tempPath()).absoluteFilePath(lit("spv_disas.txt"));
QString expandedargs = args;
QString expandedargs = programArguments;
bool writesToFile = expandedargs.contains(lit("{spv_disas}"));