Add a utility function for following a chain of base types

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

diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp
index 2da8345de4a7002e0020d98fe536443c72b8cba6..df3312e1fa9f6b46f3fdc52f7e305ded14059bab 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;