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

Preserve stdout/stderr from external shader tools and display to user

Browse Source
This commit is contained in:
baldurk
2018-08-15 13:40:21 +01:00
parent b90efe114a
commit babe36bf7e
6 changed files with 292 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/ShaderViewer.cpp
+18 -12
View File
@@ -306,9 +306,9 @@ void ShaderViewer::editShader(bool customShader, ShaderStage stage, const QStrin
if(!customShader)
{
ui->compilationGroup->setWindowTitle(tr("Compilation Settings"));
ui->docking->addToolWindow(
ui->compilationGroup,
ToolWindowManager::AreaReference(ToolWindowManager::AddTo, ui->docking->areaOf(m_Errors)));
ui->docking->addToolWindow(ui->compilationGroup,
ToolWindowManager::AreaReference(
ToolWindowManager::LeftOf, ui->docking->areaOf(m_Errors), 0.5f));
ui->docking->setToolWindowProperties(
ui->compilationGroup,
ToolWindowManager::HideCloseButton | ToolWindowManager::DisallowFloatWindow);
@@ -1193,10 +1193,17 @@ void ShaderViewer::disassemble_typeChanged(int index)
{
if(targetStr == targetName(disasm))
{
QString result = disasm.DisassembleShader(this, m_ShaderDetails, "");
ShaderToolOutput out = disasm.DisassembleShader(this, m_ShaderDetails, "");
const char *text;
if(out.result.isEmpty())
text = out.log.c_str();
else
text = (const char *)out.result.data();
m_DisassemblyView->setReadOnly(false);
m_DisassemblyView->setText(result.toUtf8().data());
m_DisassemblyView->setText(text);
m_DisassemblyView->setReadOnly(true);
m_DisassemblyView->emptyUndoBuffer();
return;
@@ -3462,17 +3469,16 @@ void ShaderViewer::on_refresh_clicked()
{
if(QString(tool.name) == ui->compileTool->currentText())
{
bytebuf result = tool.CompileShader(this, source, ui->entryFunc->text(), m_Stage,
ui->toolCommandLine->toPlainText());
ShaderToolOutput out = tool.CompileShader(this, source, ui->entryFunc->text(), m_Stage,
ui->toolCommandLine->toPlainText());
if(result.isEmpty())
{
ShowErrors(tr("Error invoking '%1' to compile source").arg(tool.name));
ShowErrors(out.log);
if(out.result.isEmpty())
return;
}
encoding = tool.output;
shaderBytes = result;
shaderBytes = out.result;
break;
}
}