From 4a50e28a781a764633f98b6c11588096c23da141 Mon Sep 17 00:00:00 2001
From: Jake Turner <jake@evansturner.co.uk>
Date: Sun, 18 May 2025 11:09:24 +0100
Subject: [PATCH] Spirv debug set rows = 0, columns = 0 for helper Struct
 ShaderVariable's

---
 renderdoc/driver/shaders/spirv/spirv_debug.cpp       | 12 ++++++------
 .../driver/shaders/spirv/spirv_debug_glsl450.cpp     |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/renderdoc/driver/shaders/spirv/spirv_debug.cpp b/renderdoc/driver/shaders/spirv/spirv_debug.cpp
index a693d65a8..148015406 100644
--- a/renderdoc/driver/shaders/spirv/spirv_debug.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_debug.cpp
@@ -2478,8 +2478,8 @@ void ThreadState::StepNext(ShaderDebugState *state, const rdcarray<ThreadState>
       }
 
       ShaderVariable result;
-      result.rows = 1;
-      result.columns = 1;
+      result.rows = 0;
+      result.columns = 0;
       result.type = VarType::Struct;
       result.members = {lsb, msb};
       result.members[0].name = "lsb";
@@ -3499,8 +3499,8 @@ void ThreadState::StepNext(ShaderDebugState *state, const rdcarray<ThreadState>
       // we make a little struct out of the combination
 
       ShaderVariable result;
-      result.rows = 1;
-      result.columns = 1;
+      result.rows = 0;
+      result.columns = 0;
       result.type = VarType::Struct;
       result.members = {GetSrc(sampled.image), GetSrc(sampled.sampler)};
       result.members[0].name = "image";
@@ -4077,8 +4077,8 @@ void ThreadState::StepNext(ShaderDebugState *state, const rdcarray<ThreadState>
       OpImageTexelPointer ptr(it);
 
       ShaderVariable result;
-      result.rows = 1;
-      result.columns = 1;
+      result.rows = 0;
+      result.columns = 0;
       result.type = VarType::Struct;
       result.members = {ReadPointerValue(ptr.image), GetSrc(ptr.coordinate), GetSrc(ptr.sample)};
       result.members[0].name = "image";
diff --git a/renderdoc/driver/shaders/spirv/spirv_debug_glsl450.cpp b/renderdoc/driver/shaders/spirv/spirv_debug_glsl450.cpp
index 5eb167175..17aefaf41 100644
--- a/renderdoc/driver/shaders/spirv/spirv_debug_glsl450.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_debug_glsl450.cpp
@@ -413,8 +413,8 @@ ShaderVariable ModfStruct(ThreadState &state, uint32_t, const rdcarray<Id> &para
   ShaderVariable var = state.GetSrc(params[0]);
 
   ShaderVariable ret;
-  ret.rows = 1;
-  ret.columns = 1;
+  ret.rows = 0;
+  ret.columns = 0;
   ret.type = VarType::Struct;
   ret.members = {var, var};
   ret.members[0].name = "_child0";
@@ -786,8 +786,8 @@ ShaderVariable FrexpStruct(ThreadState &state, uint32_t, const rdcarray<Id> &par
   ShaderVariable var = state.GetSrc(params[0]);
 
   ShaderVariable ret;
-  ret.rows = 1;
-  ret.columns = 1;
+  ret.rows = 0;
+  ret.columns = 0;
   ret.type = VarType::Struct;
   ret.members = {var, var};
   ret.members[0].name = "_child0";