X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Freflect.cpp;h=6027acde36862363a6597bebe60db488fa666351;hb=c849969d056972dd976cfa616363f1bc8cbc6291;hp=258244e88b4e2457b441a75bfe9ecbed24fcc2b8;hpb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;p=libs%2Fgl.git

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index 258244e8..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)
@@ -320,7 +322,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>();
+			}
 }
 
 
@@ -380,6 +386,19 @@ void DependencyCollector::visit(FunctionDeclaration &func)
 	}
 }
 
+
+set<VariableDeclaration *> AssignmentCollector::apply(Node &node)
+{
+	node.visit(*this);
+	return assigned_variables;
+}
+
+void AssignmentCollector::visit(Assignment &assign)
+{
+	if(VariableDeclaration *var = dynamic_cast<VariableDeclaration *>(assign.target.declaration))
+		assigned_variables.insert(var);
+}
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp