Display colour swatch when showing cbuffer values as RGB. Closes #3533

Author: baldurk

qrenderdoc/Code/QRDUtils.cpp

@@ -1835,6 +1835,27 @@ QString GetComponentString(byte mask)
   return ret;
 }
 
+QIcon MakeSwatchIcon(QWidget *parentWidget, QColor swatchColor)
+{
+  int h = parentWidget->fontMetrics().height();
+  QPixmap pm(1, 1);
+  pm.fill(swatchColor);
+  pm = pm.scaled(QSize(h, h));
+
+  {
+    QPainter painter(&pm);
+
+    QPen pen(parentWidget->palette().foreground(), 1.0);
+    painter.setPen(pen);
+    painter.drawLine(QPoint(0, 0), QPoint(h - 1, 0));
+    painter.drawLine(QPoint(h - 1, 0), QPoint(h - 1, h - 1));
+    painter.drawLine(QPoint(h - 1, h - 1), QPoint(0, h - 1));
+    painter.drawLine(QPoint(0, h - 1), QPoint(0, 0));
+  }
+
+  return QIcon(pm);
+}
+
 float ConvertLinearToSRGB(float linear)
 {
   if(linear <= 0.0031308f)

qrenderdoc/Code/QRDUtils.h

@@ -267,6 +267,7 @@ QString TypeString(const SigParameter &sig);
 QString D3DSemanticString(const SigParameter &sig);
 QString GetComponentString(byte mask);
 
+QIcon MakeSwatchIcon(QWidget *parentWidget, QColor swatchColor);
 float ConvertLinearToSRGB(float linear);
 void CombineUsageEvents(
     ICaptureContext &ctx, const rdcarray<EventUsage> &usage,

qrenderdoc/Windows/BufferViewer.cpp

@@ -4264,6 +4264,27 @@ void BufferViewer::UI_AddFixedVariables(RDTreeWidgetItem *root, uint32_t baseOff
     RDTreeWidgetItem *n =
         new RDTreeWidgetItem({v.name, VarString(v, c), offsetStr, TypeString(v, c)});
 
+    // display colour swatch for floats with RGB display
+    if((v.flags & ShaderVariableFlags::RGBDisplay) && VarTypeCompType(v.type) == CompType::Float &&
+       v.rows == 1 && v.columns >= 1 && v.members.empty())
+    {
+      QColor swatchColor(0, 0, 0, 255);
+      float rgb[3] = {0.0f, 0.0f, 0.0f};
+      for(uint8_t col = 0; col < v.columns && col < 4; col++)
+      {
+        float fval = 0.0f;
+        if(v.type == VarType::Float)
+          fval = v.value.f32v[col];
+        else if(v.type == VarType::Double)
+          fval = float(v.value.f64v[col]);
+        else if(v.type == VarType::Half)
+          fval = float(v.value.f16v[col]);
+        rgb[col] = ConvertLinearToSRGB(fval);
+      }
+      swatchColor.setRgbF(rgb[0], rgb[1], rgb[2], 1.0f);
+      n->setIcon(1, MakeSwatchIcon(ui->fixedVars, swatchColor));
+    }
+
     n->setTag(QVariant::fromValue(FixedVarTag(v.name, baseOffset + c.byteOffset)));
 
     root->addChild(n);

qrenderdoc/Windows/ShaderViewer.cpp

@@ -4618,23 +4618,7 @@ bool ShaderViewer::updateWatchVariable(RDTreeWidgetItem *watchItem, const RDTree
   }
   else
   {
-    int h = ui->watch->fontMetrics().height();
-    QPixmap pm(1, 1);
-    pm.fill(swatchColor);
-    pm = pm.scaled(QSize(h, h));
-
-    {
-      QPainter painter(&pm);
-
-      QPen pen(ui->watch->palette().foreground(), 1.0);
-      painter.setPen(pen);
-      painter.drawLine(QPoint(0, 0), QPoint(h - 1, 0));
-      painter.drawLine(QPoint(h - 1, 0), QPoint(h - 1, h - 1));
-      painter.drawLine(QPoint(h - 1, h - 1), QPoint(0, h - 1));
-      painter.drawLine(QPoint(0, h - 1), QPoint(0, 0));
-    }
-
-    watchItem->setIcon(3, QIcon(pm));
+    watchItem->setIcon(3, MakeSwatchIcon(ui->watch, swatchColor));
   }
 
   watchItem->setText(3, val);