X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Ffinalize.cpp;h=6e9a478012e0dad898065da952868d8bf03eff46;hp=2d1a46fb0862639457a1137a2de94036c6a1f7da;hb=8967d38bc578f1653c1dde01dce49a8f7b0c912e;hpb=42903b905cd3924ecc45d3cb08222bc3548cab91

diff --git a/source/glsl/finalize.cpp b/source/glsl/finalize.cpp
index 2d1a46fb..6e9a4780 100644
--- a/source/glsl/finalize.cpp
+++ b/source/glsl/finalize.cpp
@@ -12,6 +12,57 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
+StructOrganizer::StructOrganizer():
+	offset(-1)
+{ }
+
+void StructOrganizer::visit(StructDeclaration &strct)
+{
+	SetForScope<int> set_offset(offset, 0);
+	TraversingVisitor::visit(strct);
+}
+
+void StructOrganizer::visit(VariableDeclaration &var)
+{
+	if(offset>=0)
+	{
+		int *layout_offset = 0;
+		if(var.layout)
+		{
+			vector<Layout::Qualifier> &qualifiers = var.layout->qualifiers;
+			for(vector<Layout::Qualifier>::iterator i=qualifiers.begin(); i!=qualifiers.end(); ++i)
+				if(i->name=="offset" && i->has_value)
+				{
+					layout_offset = &i->value;
+					if(i->value>=offset)
+						offset = i->value;
+					break;
+				}
+		}
+
+		MemoryRequirementsCalculator::Result mem_reqs = MemoryRequirementsCalculator().apply(var);
+		offset += mem_reqs.alignment-1;
+		offset -= offset%mem_reqs.alignment;
+
+		if(layout_offset)
+			*layout_offset = offset;
+		else
+		{
+			if(!var.layout)
+				var.layout = new Layout;
+
+			Layout::Qualifier qual;
+			qual.name = "offset";
+			qual.has_value = true;
+			qual.value = offset;
+			var.layout->qualifiers.push_back(qual);
+		}
+
+		offset += mem_reqs.size;
+	}
+}
+
+
 void LocationAllocator::apply(Module &module, const Features &features)
 {
 	for(list<Stage>::iterator i=module.stages.begin(); i!=module.stages.end(); ++i)