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

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index 8ee8a88d..643c42e7 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;
@@ -218,6 +219,8 @@ void TypeComparer::visit(VariableDeclaration &var)
 				r_result = false;
 				if(var1->array_size && var.array_size)
 					compare(*var1->array_size, *var.array_size);
+				else if(!var1->array_size && !var.array_size)
+					r_result = true;
 			}
 			if(r_result && var1->type_declaration!=var.type_declaration)
 				compare(*var1->type_declaration, *var.type_declaration);
@@ -283,6 +286,9 @@ void MemoryRequirementsCalculator::visit(BasicTypeDeclaration &basic)
 	}
 	else if(basic.kind==BasicTypeDeclaration::ARRAY)
 		basic.base_type->visit(*this);
+
+	if(basic.extended_alignment)
+		r_alignment = (r_alignment+15)&~15U;
 }
 
 void MemoryRequirementsCalculator::visit(StructDeclaration &strct)
@@ -295,7 +301,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;
@@ -304,16 +310,15 @@ void MemoryRequirementsCalculator::visit(StructDeclaration &strct)
 	}
 	r_size = total;
 	r_alignment = max_align;
+	if(strct.extended_alignment)
+		r_alignment = (r_alignment+15)&~15U;
+	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);
@@ -323,7 +328,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>();
 			}
 }
 
@@ -343,15 +348,6 @@ void DependencyCollector::visit(VariableReference &var)
 	}
 }
 
-void DependencyCollector::visit(InterfaceBlockReference &iface)
-{
-	if(iface.declaration)
-	{
-		dependencies.insert(iface.declaration);
-		iface.declaration->visit(*this);
-	}
-}
-
 void DependencyCollector::visit(FunctionCall &call)
 {
 	if(call.declaration)
@@ -385,16 +381,38 @@ 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(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