Check the flat qualifier from the correct member

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

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index 6027acde36862363a6597bebe60db488fa666351..becc833e28ef7da9c9bbcd5fc5ad6e6fe7d81ce6 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;
@@ -158,6 +159,25 @@ void TypeComparer::visit(TernaryExpression &ternary)
        }
 }
 
+void TypeComparer::visit(FunctionCall &call)
+{
+       if(FunctionCall *call1 = multi_visit(call))
+       {
+               if(!call1->constructor || !call.constructor)
+                       r_result = false;
+               else if(call1->name!=call.name)
+                       r_result = false;
+               else if(call1->arguments.size()!=call.arguments.size())
+                       r_result = false;
+               else
+               {
+                       r_result = true;
+                       for(unsigned i=0; (r_result && i<call.arguments.size()); ++i)
+                               compare(*call1->arguments[i], *call.arguments[i]);
+               }
+       }
+}
+
 void TypeComparer::visit(BasicTypeDeclaration &basic)
 {
        if(BasicTypeDeclaration *basic1 = multi_visit(basic))
@@ -177,7 +197,9 @@ void TypeComparer::visit(ImageTypeDeclaration &image)
        {
                if(image1->dimensions!=image.dimensions || image1->array!=image.array)
                        r_result = false;
-               else if(image1->sampled!=image.sampled || image1->shadow!=image.shadow)
+               else if(image1->sampled!=image.sampled || image1->shadow!=image.shadow || image1->multisample!=image.multisample)
+                       r_result = false;
+               else if(image1->format!=image.format)
                        r_result = false;
                else if(image1->base_type && image.base_type)
                        compare(*image1->base_type, *image.base_type);
@@ -218,6 +240,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 +307,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 +322,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,18 +331,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);
@@ -345,15 +369,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)
@@ -387,16 +402,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