From 1201d47db4ccd84cfa8fda8f7b4ad0eb06435e25 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 21 Apr 2022 00:58:15 +0100
Subject: [PATCH] Fix tooltips for sampler variables in shader debugger

---
 qrenderdoc/Windows/ShaderViewer.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp
index 09bc1744e..b76a984d2 100644
--- a/qrenderdoc/Windows/ShaderViewer.cpp
+++ b/qrenderdoc/Windows/ShaderViewer.cpp
@@ -5489,9 +5489,10 @@ void ShaderViewer::updateVariableTooltip()
   {
     QString tooltip;
 
-    if(var.type == VarType::ReadOnlyResource || var.type == VarType::ReadWriteResource)
+    if(var.type == VarType::Sampler || var.type == VarType::ReadOnlyResource ||
+       var.type == VarType::ReadWriteResource)
     {
-      tooltip = RichResourceTextFormat(m_Ctx, stringRep(var, 0));
+      tooltip = QFormatStr("%1: ").arg(var.name) + RichResourceTextFormat(m_Ctx, stringRep(var, 0));
     }
     else
     {
@@ -5505,6 +5506,17 @@ void ShaderViewer::updateVariableTooltip()
     QToolTip::showText(m_TooltipPos, tooltip);
     return;
   }
+  else if(var.members.size() == 2 && var.members[0].type == VarType::ReadOnlyResource &&
+          var.members[1].type == VarType::Sampler)
+  {
+    // combined image/sampler structs
+    QToolTip::showText(m_TooltipPos,
+                       QFormatStr("%1: %2 & %3")
+                           .arg(var.name)
+                           .arg(RichResourceTextFormat(m_Ctx, stringRep(var.members[0], 0)))
+                           .arg(RichResourceTextFormat(m_Ctx, stringRep(var.members[1], 0))));
+    return;
+  }
 
   QString text = QFormatStr("<pre>%1\n").arg(var.name);
   text +=