Fix a name conflict in certain inlining scenarios

[libs/gl.git] / source / glsl / reflect.cpp

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index cc2e3a0c8bc2c6570e30bb50decd35cd413b97f1..32c7c7330d0577fde5c156f90d0e3b9925022518 100644 (file)
--- 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;
@@ -295,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;
@@ -304,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>();
+                       }
 }
 
 
@@ -381,16 +383,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