X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Freflect.cpp;h=6027acde36862363a6597bebe60db488fa666351;hp=8ee8a88dfe96750dd3234d88a751cc131e27ad10;hb=c1bf0909af97772da5b26d82272f337a14c1fae9;hpb=4571472425ca75573895c96f590ba12dedbed661

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index 8ee8a88d..6027acde 100644
--- a/source/glsl/reflect.cpp
+++ b/source/glsl/reflect.cpp
@@ -304,6 +304,8 @@ void MemoryRequirementsCalculator::visit(StructDeclaration &strct)
 	}
 	r_size = total;
 	r_alignment = max_align;
+	r_size += r_alignment-1;
+	r_size -= r_size%r_alignment;
 }
 
 void MemoryRequirementsCalculator::visit(VariableDeclaration &var)
@@ -323,7 +325,7 @@ void MemoryRequirementsCalculator::visit(VariableDeclaration &var)
 			{
 				unsigned aligned_size = r_size+r_alignment-1;
 				aligned_size -= aligned_size%r_alignment;
-				r_size += aligned_size*(literal->value.value<int>()-1);
+				r_size = aligned_size*literal->value.value<int>();
 			}
 }