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 91e8fa55dde940020c5255e97e48eb69abbf7afb..32c7c7330d0577fde5c156f90d0e3b9925022518 100644 (file)
--- a/source/glsl/reflect.cpp
+++ b/source/glsl/reflect.cpp
@@ -1,3 +1,5 @@
+#include <msp/core/algorithm.h>
+#include <msp/core/raii.h>
 #include "reflect.h"
 
 using namespace std;
@@ -48,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)
@@ -121,6 +116,49 @@ void TypeComparer::visit(VariableReference &var)
        }
 }
 
+void TypeComparer::visit(UnaryExpression &unary)
+{
+       if(UnaryExpression *unary1 = multi_visit(unary))
+       {
+               if(unary1->oper!=unary.oper)
+                       r_result = false;
+               else
+                       compare(*unary1->expression, *unary.expression);
+       }
+}
+
+void TypeComparer::visit(BinaryExpression &binary)
+{
+       if(BinaryExpression *binary1 = multi_visit(binary))
+       {
+               if(binary1->oper!=binary.oper)
+                       r_result = false;
+               else
+               {
+                       compare(*binary1->left, *binary.left);
+                       if(r_result)
+                               compare(*binary1->right, *binary.right);
+               }
+       }
+}
+
+void TypeComparer::visit(TernaryExpression &ternary)
+{
+       if(TernaryExpression *ternary1 = multi_visit(ternary))
+       {
+               if(ternary1->oper!=ternary.oper)
+                       r_result = false;
+               else
+               {
+                       compare(*ternary1->condition, *ternary.condition);
+                       if(r_result)
+                               compare(*ternary1->true_expr, *ternary.true_expr);
+                       if(r_result)
+                               compare(*ternary1->false_expr, *ternary.false_expr);
+               }
+       }
+}
+
 void TypeComparer::visit(BasicTypeDeclaration &basic)
 {
        if(BasicTypeDeclaration *basic1 = multi_visit(basic))
@@ -158,8 +196,8 @@ void TypeComparer::visit(StructDeclaration &strct)
                else
                {
                        r_result = true;
-                       NodeList<Statement>::const_iterator i = strct1->members.body.begin();
-                       NodeList<Statement>::const_iterator j = strct.members.body.begin();
+                       auto i = strct1->members.body.begin();
+                       auto j = strct.members.body.begin();
                        for(; (r_result && i!=strct1->members.body.end()); ++i, ++j)
                                compare(**i, **j);
                }
@@ -190,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;
@@ -207,10 +241,10 @@ void LocationCounter::visit(ImageTypeDeclaration &)
 void LocationCounter::visit(StructDeclaration &strct)
 {
        unsigned total = 0;
-       for(NodeList<Statement>::const_iterator i=strct.members.body.begin(); i!=strct.members.body.end(); ++i)
+       for(const RefPtr<Statement> &s: strct.members.body)
        {
                r_count = 1;
-               (*i)->visit(*this);
+               s->visit(*this);
                total += r_count;
        }
        r_count = total;
@@ -256,13 +290,13 @@ void MemoryRequirementsCalculator::visit(StructDeclaration &strct)
 {
        unsigned total = 0;
        unsigned max_align = 1;
-       for(NodeList<Statement>::iterator i=strct.members.body.begin(); i!=strct.members.body.end(); ++i)
+       for(const RefPtr<Statement> &s: strct.members.body)
        {
                r_size = 0;
                r_alignment = 1;
                r_offset = -1;
-               (*i)->visit(*this);
-               if(r_offset)
+               s->visit(*this);
+               if(r_offset>=0)
                        total = r_offset;
                total += r_alignment-1;
                total -= total%r_alignment;
@@ -271,24 +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)
-       {
-               const vector<Layout::Qualifier> qualifiers = var.layout->qualifiers;
-               for(vector<Layout::Qualifier>::const_iterator i=qualifiers.begin(); (r_offset<0 && i!=qualifiers.end()); ++i)
-                       if(i->name=="offset")
-                               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>();
+                       }
 }
 
 
@@ -348,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