Consider expressions in array sizes when comparing types for equality

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

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index 8c10acccd697c265063d481a8f1a8b055ac492bb..83af09a6f8b092bfb9cf3a76d949644ae5638793 100644 (file)
--- a/source/glsl/reflect.cpp
+++ b/source/glsl/reflect.cpp
@@ -1,3 +1,4 @@
+#include <msp/core/algorithm.h>
 #include "reflect.h"
 
 using namespace std;
@@ -121,6 +122,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 +202,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);
                }
@@ -207,10 +251,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,12 +300,12 @@ 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);
+               s->visit(*this);
                if(r_offset)
                        total = r_offset;
                total += r_alignment-1;
@@ -277,10 +321,9 @@ 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;
+               auto i = find_member(var.layout->qualifiers, string("offset"), &Layout::Qualifier::name);
+               if(i!=var.layout->qualifiers.end())
+                       r_offset = i->value;
        }
 
        if(var.type_declaration)
@@ -321,7 +364,8 @@ void DependencyCollector::visit(FunctionCall &call)
        if(call.declaration)
        {
                dependencies.insert(call.declaration);
-               call.declaration->visit(*this);
+               if(call.declaration->definition)
+                       call.declaration->definition->visit(*this);
        }
        TraversingVisitor::visit(call);
 }