From d1df4bdcc190c09c3d77a2f1b2bcb394a6d355f0 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 1 Mar 2018 16:46:25 +0000 Subject: [PATCH] Append shader entry point and filename to existing resource IDs * This way even if shader debug info is present there are still resource links. --- .../PipelineState/VulkanPipelineStateViewer.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp index 5be8cab09..c0fc362b4 100644 --- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp @@ -1271,20 +1271,22 @@ void VulkanPipelineStateViewer::setShaderState(const VKPipe::Shader &stage, { ShaderReflection *shaderDetails = stage.reflection; - shader->setText( - QFormatStr("%1: %2").arg(ToQStr(pipe.pipelineResourceId)).arg(ToQStr(stage.resourceId))); + QString shText = + QFormatStr("%1: %2").arg(ToQStr(pipe.pipelineResourceId)).arg(ToQStr(stage.resourceId)); if(shaderDetails != NULL) { QString entryFunc = shaderDetails->entryPoint; - if(!shaderDetails->debugInfo.files.isEmpty() || entryFunc != lit("main")) - shader->setText(entryFunc + lit("()")); + + if(entryFunc != lit("main")) + shText += lit(": ") + entryFunc + lit("()"); if(!shaderDetails->debugInfo.files.isEmpty()) - shader->setText(entryFunc + lit("() - ") + - QFileInfo(shaderDetails->debugInfo.files[0].filename).fileName()); + shText += lit(" - ") + QFileInfo(shaderDetails->debugInfo.files[0].filename).fileName(); } + shader->setText(shText); + int vs = 0; // hide the tree columns. The functions below will add it