X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Freflect.cpp;h=32c7c7330d0577fde5c156f90d0e3b9925022518;hb=66cf095b3eeb3f5a37cc16231680a18d67b292fb;hp=83af09a6f8b092bfb9cf3a76d949644ae5638793;hpb=3f245515062d10e4d527827e5126fe412de06ce0;p=libs%2Fgl.git

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index 83af09a6..32c7c733 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;
@@ -49,13 +50,6 @@ bool can_convert(const BasicTypeDeclaration &from, const BasicTypeDeclaration &t
 
 unsigned TypeComparer::next_tag = 1;
 
-TypeComparer::TypeComparer():
-	first(0),
-	second(0),
-	first_tag(0),
-	r_result(false)
-{ }
-
 void TypeComparer::compare(Node &node1, Node &node2)
 {
 	if(&node1==&node2)
@@ -234,10 +228,6 @@ void TypeComparer::visit(VariableDeclaration &var)
 }
 
 
-LocationCounter::LocationCounter():
-	r_count(0)
-{ }
-
 void LocationCounter::visit(BasicTypeDeclaration &basic)
 {
 	r_count = basic.kind==BasicTypeDeclaration::MATRIX ? basic.size>>16 : 1;
@@ -306,7 +296,7 @@ void MemoryRequirementsCalculator::visit(StructDeclaration &strct)
 		r_alignment = 1;
 		r_offset = -1;
 		s->visit(*this);
-		if(r_offset)
+		if(r_offset>=0)
 			total = r_offset;
 		total += r_alignment-1;
 		total -= total%r_alignment;
@@ -315,23 +305,24 @@ 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)
 {
-	if(var.layout)
-	{
-		auto i = find_member(var.layout->qualifiers, string("offset"), &Layout::Qualifier::name);
-		if(i!=var.layout->qualifiers.end())
-			r_offset = i->value;
-	}
+	r_offset = get_layout_value(var.layout.get(), "offset");
 
 	if(var.type_declaration)
 		var.type_declaration->visit(*this);
 	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>();
+			}
 }
 
 
@@ -391,6 +382,47 @@ void DependencyCollector::visit(FunctionDeclaration &func)
 	}
 }
 
+
+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)
+{
+	{
+		SetFlag set_assignment(assignment_target);
+		assign.left->visit(*this);
+	}
+	assign.right->visit(*this);
+}
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp