Sorting array members in the watch window correctly

This sets the offset of the VariableTag for array members in the watch
window. This ensures they are sorted correctly when displayed.

Sorting array members in the watch window correctly

This sets the offset of the VariableTag for array members in the watch
window. This ensures they are sorted correctly when displayed.

Sorting array members in the watch window correctly

This sets the offset of the VariableTag for array members in the watch
window. This ensures they are sorted correctly when displayed.

Author: Sharlock93

qrenderdoc/Windows/ShaderViewer.cpp

@@ -3139,6 +3139,8 @@ void ShaderViewer::combineStructures(RDTreeWidgetItem *root, int skipPrefixLengt
                 VariableTag bt = b->tag().value<VariableTag>();
                 if(at.offset != bt.offset)
                   return at.offset < bt.offset;
+                if(at.globalSourceVar && bt.globalSourceVar)
+                  return at.sourceVarIdx < bt.sourceVarIdx;
                 return a->text(0) < b->text(0);
               });
 
@@ -4560,6 +4562,7 @@ bool ShaderViewer::updateWatchVariable(RDTreeWidgetItem *watchItem, const RDTree
         });
         VariableTag tag = VariableTag(DebugVariableType::Variable, path);
         tag.state = WatchVarState::Valid;
+        tag.offset = i;
         item->setTag(QVariant::fromValue(tag));
         watchItem->addChild(item);
         valid.push_back(false);
@@ -4592,6 +4595,8 @@ bool ShaderViewer::updateWatchVariable(RDTreeWidgetItem *watchItem, const RDTree
                 VariableTag bt = b->tag().value<VariableTag>();
                 if(at.offset != bt.offset)
                   return at.offset < bt.offset;
+                if(at.globalSourceVar && bt.globalSourceVar)
+                  return at.sourceVarIdx < bt.sourceVarIdx;
                 return a->text(0) < b->text(0);
               });
 
@@ -4604,6 +4609,7 @@ bool ShaderViewer::updateWatchVariable(RDTreeWidgetItem *watchItem, const RDTree
 
     VariableTag tag = VariableTag(DebugVariableType::Variable, path);
     tag.state = WatchVarState::Valid;
+    tag.offset = watchItem->tag().value<VariableTag>().offset;
     watchItem->setTag(QVariant::fromValue(tag));
 
     return true;
@@ -4803,6 +4809,9 @@ bool ShaderViewer::updateWatchVariable(RDTreeWidgetItem *watchItem, const RDTree
 
   VariableTag tag = VariableTag(DebugVariableType::Variable, path);
   tag.state = WatchVarState::Valid;
+  // Grab the offset that is already set
+  uint32_t offset = watchItem->tag().value<VariableTag>().offset;
+  tag.offset = offset;
   watchItem->setTag(QVariant::fromValue(tag));
 
   return true;