Make pipeline flowchart more 'sticky' between mesh and normal draws

* It won't be as quick to revert to the normal pipeline, but stay showing the mesh pipeline.
baldurk · Jan 10, 2024 · 928de11 · 928de11
1 parent 6fdea16
commit 928de11
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
@@ -1648,13 +1648,18 @@ void D3D12PipelineStateViewer::setState()
   // highlight the appropriate stages in the flowchart
   if(action == NULL)
   {
-    setOldMeshPipeFlow();
-    ui->pipeFlow->setStagesEnabled({true, true, true, true, true, true, true, true, true});
+    QList<bool> allOn;
+    for(int i = 0; i < ui->pipeFlow->stageNames().count(); i++)
+      allOn.append(true);
+    ui->pipeFlow->setStagesEnabled(allOn);
   }
   else if(action->flags & ActionFlags::Dispatch)
   {
-    setOldMeshPipeFlow();
-    ui->pipeFlow->setStagesEnabled({false, false, false, false, false, false, false, false, true});
+    QList<bool> computeOnly;
+    for(int i = 0; i < ui->pipeFlow->stageNames().count(); i++)
+      computeOnly.append(false);
+    computeOnly.back() = true;
+    ui->pipeFlow->setStagesEnabled(computeOnly);
   }
   else if(action->flags & ActionFlags::MeshDispatch)
   {

diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
@@ -2265,13 +2265,18 @@ void VulkanPipelineStateViewer::setState()
   // highlight the appropriate stages in the flowchart
   if(action == NULL)
   {
-    setOldMeshPipeFlow();
-    ui->pipeFlow->setStagesEnabled({true, true, true, true, true, true, true, true, true});
+    QList<bool> allOn;
+    for(int i = 0; i < ui->pipeFlow->stageNames().count(); i++)
+      allOn.append(true);
+    ui->pipeFlow->setStagesEnabled(allOn);
   }
   else if(action->flags & ActionFlags::Dispatch)
   {
-    setOldMeshPipeFlow();
-    ui->pipeFlow->setStagesEnabled({false, false, false, false, false, false, false, false, true});
+    QList<bool> computeOnly;
+    for(int i = 0; i < ui->pipeFlow->stageNames().count(); i++)
+      computeOnly.append(false);
+    computeOnly.back() = true;
+    ui->pipeFlow->setStagesEnabled(computeOnly);
   }
   else if(action->flags & ActionFlags::MeshDispatch)
   {