From 23779cd03a8b1f6fdc3b2e4d8880170d3fa6146f Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 7 Nov 2021 14:31:38 +0200
Subject: [PATCH] Fix size calculation for GLSL arrays

---
 source/glsl/reflect.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index cc2e3a0c..8ee8a88d 100644
--- a/source/glsl/reflect.cpp
+++ b/source/glsl/reflect.cpp
@@ -320,7 +320,11 @@ void MemoryRequirementsCalculator::visit(VariableDeclaration &var)
 	if(var.array)
 		if(const Literal *literal = dynamic_cast<const Literal *>(var.array_size.get()))
 			if(literal->value.check_type<int>())
-				r_size += r_alignment*(literal->value.value<int>()-1);
+			{
+				unsigned aligned_size = r_size+r_alignment-1;
+				aligned_size -= aligned_size%r_alignment;
+				r_size += aligned_size*(literal->value.value<int>()-1);
+			}
 }
 
 
-- 
2.43.0