X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Freflect.cpp;h=811679f3295c320b30d2caaf8bb92d7ac164f992;hb=6997ed1c07c382c0f66c57c080934ad53e1d3713;hp=8ee8a88dfe96750dd3234d88a751cc131e27ad10;hpb=23779cd03a8b1f6fdc3b2e4d8880170d3fa6146f;p=libs%2Fgl.git

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index 8ee8a88d..811679f3 100644
--- a/source/glsl/reflect.cpp
+++ b/source/glsl/reflect.cpp
@@ -1,4 +1,5 @@
 #include <msp/core/algorithm.h>
+#include <msp/core/raii.h>
 #include "reflect.h"
 
 using namespace std;
@@ -304,6 +305,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 +326,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>();
 			}
 }
 
@@ -385,16 +388,44 @@ void DependencyCollector::visit(FunctionDeclaration &func)
 }
 
 
-set<VariableDeclaration *> AssignmentCollector::apply(Node &node)
+set<Node *> AssignmentCollector::apply(Node &node)
 {
 	node.visit(*this);
 	return assigned_variables;
 }
 
+void AssignmentCollector::visit(VariableReference &var)
+{
+	if(assignment_target)
+		assigned_variables.insert(var.declaration);
+}
+
+void AssignmentCollector::visit(InterfaceBlockReference &iface)
+{
+	if(assignment_target)
+		assigned_variables.insert(iface.declaration);
+}
+
+void AssignmentCollector::visit(UnaryExpression &unary)
+{
+	SetFlag set_assignment(assignment_target, (unary.oper->token[1]=='+' || unary.oper->token[1]=='-'));
+	TraversingVisitor::visit(unary);
+}
+
+void AssignmentCollector::visit(BinaryExpression &binary)
+{
+	binary.left->visit(*this);
+	SetFlag clear_assignment(assignment_target, false);
+	binary.right->visit(*this);
+}
+
 void AssignmentCollector::visit(Assignment &assign)
 {
-	if(VariableDeclaration *var = dynamic_cast<VariableDeclaration *>(assign.target.declaration))
-		assigned_variables.insert(var);
+	{
+		SetFlag set_assignment(assignment_target);
+		assign.left->visit(*this);
+	}
+	assign.right->visit(*this);
 }
 
 } // namespace SL