From 49d6f205e9c2c449199a53d9182e52e59b231269 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 11 May 2020 10:29:31 +0100
Subject: [PATCH] Add padding for buffers where matrixByteStride needs it.
 Closes #1874

---
 qrenderdoc/Code/BufferFormatter.cpp | 48 +++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/qrenderdoc/Code/BufferFormatter.cpp b/qrenderdoc/Code/BufferFormatter.cpp
index de246944c..5be130596 100644
--- a/qrenderdoc/Code/BufferFormatter.cpp
+++ b/qrenderdoc/Code/BufferFormatter.cpp
@@ -841,6 +841,46 @@ QString BufferFormatter::DeclareStruct(QList<QString> &declaredStructs, const QS
       if(members[i].type.descriptor.rowMajorStorage)
       {
         varTypeName = lit("row_major ") + varTypeName;
+
+        uint32_t tightStride =
+            VarTypeByteSize(members[i].type.descriptor.type) * members[i].type.descriptor.columns;
+
+        if(tightStride < members[i].type.descriptor.matrixByteStride)
+        {
+          uint32_t padSize = members[i].type.descriptor.matrixByteStride - tightStride;
+          for(uint32_t r = 0; r < members[i].type.descriptor.rows; r++)
+          {
+            ret += QFormatStr("    %1%2 %3_row%4; %5")
+                       .arg(ToQStr(members[i].type.descriptor.type))
+                       .arg(members[i].type.descriptor.columns)
+                       .arg(varName)
+                       .arg(r)
+                       .arg(DeclarePaddingBytes(padSize));
+          }
+
+          continue;
+        }
+      }
+      else
+      {
+        uint32_t tightStride =
+            VarTypeByteSize(members[i].type.descriptor.type) * members[i].type.descriptor.rows;
+
+        if(tightStride < members[i].type.descriptor.matrixByteStride)
+        {
+          uint32_t padSize = members[i].type.descriptor.matrixByteStride - tightStride;
+          for(uint32_t c = 0; c < members[i].type.descriptor.columns; c++)
+          {
+            ret += QFormatStr("    %1%2 %2_col%4; %5")
+                       .arg(ToQStr(members[i].type.descriptor.type))
+                       .arg(members[i].type.descriptor.rows)
+                       .arg(varName)
+                       .arg(c)
+                       .arg(DeclarePaddingBytes(padSize));
+          }
+
+          continue;
+        }
       }
     }
 
@@ -867,6 +907,14 @@ QString BufferFormatter::DeclareStruct(QList<QString> &declaredStructs, const QS
     if(typeSize > 1)
       size *= typeSize;
 
+    if(lastChild->type.descriptor.rows > 1)
+    {
+      if(lastChild->type.descriptor.rowMajorStorage)
+        size = lastChild->type.descriptor.matrixByteStride * lastChild->type.descriptor.columns;
+      else
+        size = lastChild->type.descriptor.matrixByteStride * lastChild->type.descriptor.rows;
+    }
+
     if(lastChild->type.descriptor.elements > 1)
       size *= lastChild->type.descriptor.elements;