Remove Vulkan checks from feature converters

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

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index 811679f3295c320b30d2caaf8bb92d7ac164f992..643c42e79be90f51f07009df7343ce67df80f09e 100644 (file)
--- a/source/glsl/reflect.cpp
+++ b/source/glsl/reflect.cpp
@@ -219,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);
@@ -284,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)
@@ -296,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;
@@ -305,18 +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);
@@ -346,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)
@@ -400,12 +393,6 @@ void AssignmentCollector::visit(VariableReference &var)
                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]=='-'));