Fix a name conflict in certain inlining scenarios

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

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 2da8345de4a7002e0020d98fe536443c72b8cba6..7d3d20d1c78eb104c85ac8ef511a099b5115ae5e 100644 (file)
--- a/source/glsl/validate.cpp
+++ b/source/glsl/validate.cpp
@@ -34,6 +34,13 @@ void Validator::add_info(Node &node, const string &message)
 }
 
 
+void DeclarationValidator::apply(Stage &s, const Features &f)
+{
+       stage = &s;
+       features = f;
+       s.content.visit(*this);
+}
+
 const char *DeclarationValidator::describe_variable(ScopeType scope)
 {
        switch(scope)
@@ -62,7 +69,7 @@ void DeclarationValidator::visit(Layout &layout)
                {
                        binding = true;
 
-                       if(q.name=="set")
+                       if(q.name=="set" && features.target_api!=VULKAN)
                        {
                                error(layout, "Layout qualifier 'set' not allowed when targeting OpenGL");
                                continue;
@@ -70,11 +77,9 @@ void DeclarationValidator::visit(Layout &layout)
 
                        if(variable)
                        {
-                               TypeDeclaration *type = variable->type_declaration;
-                               while(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(type))
-                                       type = basic->base_type;
+                               const TypeDeclaration *base_type = get_ultimate_base_type(variable->type_declaration);
                                bool uniform = (variable->interface=="uniform");
-                               allowed = (scope==GLOBAL && uniform && dynamic_cast<ImageTypeDeclaration *>(type));
+                               allowed = (scope==GLOBAL && uniform && dynamic_cast<const ImageTypeDeclaration *>(base_type));
                                err_descr = (uniform ? "variable of non-opaque type" : "non-uniform variable");
                        }
                        else if(iface_block)
@@ -249,6 +254,11 @@ void DeclarationValidator::visit(VariableDeclaration &var)
                        error(var, format("Mismatched interface qualifier '%s' inside '%s' block", var.interface, iface_block->interface));
                else if(scope==STRUCT || scope==FUNCTION)
                        error(var, format("Interface qualifier not allowed on %s", descr));
+               else if(scope==GLOBAL && variable->interface=="uniform" && features.target_api==VULKAN)
+               {
+                       if(!dynamic_cast<const ImageTypeDeclaration *>(get_ultimate_base_type(variable->type_declaration)))
+                               error(var, "Interface qualifier 'uniform' not allowed on non-opaque variable in global scope");
+               }
        }
 
        TypeDeclaration *type = var.type_declaration;
@@ -516,8 +526,7 @@ void ExpressionValidator::visit(VariableReference &var)
                        error(var, format("Reference to non-constant variable '%s' in a constant expression", var.name));
                else if(var.declaration->layout && constant_expression==FIXED_CONSTANT)
                {
-                       auto i = find_member(var.declaration->layout->qualifiers, string("constant_id"), &Layout::Qualifier::name);
-                       if(i!=var.declaration->layout->qualifiers.end())
+                       if(has_layout_qualifier(var.declaration->layout.get(), "constant_id"))
                                error(var, format("Reference to specialization constant '%s' in a fixed constant expression", var.name));
                }
        }
@@ -652,13 +661,8 @@ void ExpressionValidator::visit(VariableDeclaration &var)
                var.layout->visit(*this);
        if(var.init_expression)
        {
-               ConstantKind const_kind = (var.constant ? SPEC_CONSTANT : NOT_CONSTANT);
-               if(var.layout)
-               {
-                       auto i = find_member(var.layout->qualifiers, string("constant_id"), &Layout::Qualifier::name);
-                       if(i!=var.layout->qualifiers.end())
-                               const_kind = FIXED_CONSTANT;
-               }
+               ConstantKind const_kind = (!var.constant ? NOT_CONSTANT :
+                       has_layout_qualifier(var.layout.get(), "constant_id") ? FIXED_CONSTANT : SPEC_CONSTANT);
 
                SetForScope<ConstantKind> set_const(constant_expression, const_kind);
                TraversingVisitor::visit(var.init_expression);
@@ -760,18 +764,13 @@ void FlowControlValidator::visit(Iteration &iter)
 }
 
 
-int StageInterfaceValidator::get_location(const Layout &layout)
-{
-       return get_layout_value(layout, "location", -1);
-}
-
 void StageInterfaceValidator::visit(VariableDeclaration &var)
 {
-       int location = (var.layout ? get_location(*var.layout) : -1);
+       int location = get_layout_value(var.layout.get(), "location");
        if(var.interface=="in" && var.linked_declaration)
        {
                const Layout *linked_layout = var.linked_declaration->layout.get();
-               int linked_location = (linked_layout ? get_location(*linked_layout) : -1);
+               int linked_location = get_layout_value(linked_layout, "location");
                if(linked_location!=location)
                {
                        error(var, format("Mismatched location %d for 'in %s'", location, var.name));
@@ -835,6 +834,11 @@ void GlobalInterfaceValidator::check_uniform(const Uniform &uni)
                        error(*uni.node, format("Mismatched location %d for uniform '%s'", uni.location, uni.name));
                        add_info(*i->second->node, format("Previously declared here with location %d", i->second->location));
                }
+               if(i->second->desc_set!=uni.desc_set)
+               {
+                       error(*uni.node, format("Mismatched descriptor set %d for uniform '%s'", uni.desc_set, uni.name));
+                       add_info(*i->second->node, format("Previously declared here with descriptor set %d", i->second->desc_set));
+               }
                if(uni.bind_point>=0 && i->second->bind_point>=0 && i->second->bind_point!=uni.bind_point)
                {
                        error(*uni.node, format("Mismatched binding %d for uniform '%s'", uni.bind_point, uni.name));
@@ -900,10 +904,10 @@ void GlobalInterfaceValidator::visit(VariableDeclaration &var)
                uni.name = var.name;
                if(var.layout)
                {
-                       uni.location = get_layout_value(*var.layout, "location");
+                       uni.location = get_layout_value(var.layout.get(), "location");
                        uni.loc_count = LocationCounter().apply(var);
-                       uni.desc_set = get_layout_value(*var.layout, "set", 0);
-                       uni.bind_point = get_layout_value(*var.layout, "binding");
+                       uni.desc_set = get_layout_value(var.layout.get(), "set", 0);
+                       uni.bind_point = get_layout_value(var.layout.get(), "binding");
                }
 
                uniforms.push_back(uni);
@@ -921,8 +925,8 @@ void GlobalInterfaceValidator::visit(InterfaceBlock &iface)
                uni.name = iface.block_name;
                if(iface.layout)
                {
-                       uni.desc_set = get_layout_value(*iface.layout, "set", 0);
-                       uni.bind_point = get_layout_value(*iface.layout, "binding");
+                       uni.desc_set = get_layout_value(iface.layout.get(), "set", 0);
+                       uni.bind_point = get_layout_value(iface.layout.get(), "binding");
                }
 
                uniforms.push_back(uni);