]> git.tdb.fi Git - libs/gl.git/blobdiff - source/glsl/validate.cpp
Check the flat qualifier from the correct member
[libs/gl.git] / source / glsl / validate.cpp
index 154189aa2bc8c353398b9b92a6a521c47c5afe59..f6b11ef22e34f8e019a43c5ff040eb8f05283c08 100644 (file)
@@ -1,8 +1,9 @@
-#include <algorithm>
 #include <cstring>
+#include <msp/core/algorithm.h>
 #include <msp/core/raii.h>
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
+#include "reflect.h"
 #include "validate.h"
 
 using namespace std;
@@ -11,11 +12,6 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Validator::Validator():
-       stage(0),
-       last_provoker(0)
-{ }
-
 void Validator::diagnose(Node &node, Node &provoking_node, Diagnostic::Severity severity, const string &message)
 {
        Diagnostic diag;
@@ -38,12 +34,48 @@ void Validator::add_info(Node &node, const string &message)
 }
 
 
-DeclarationValidator::DeclarationValidator():
-       scope(GLOBAL),
-       iface_layout(0),
-       iface_block(0),
-       variable(0)
-{ }
+void DeclarationValidator::apply(Stage &s, const Features &f)
+{
+       stage = &s;
+       features = f;
+       s.content.visit(*this);
+
+       Node *global_err_node = 0;
+       auto i = s.functions.find("main()");
+       if(i!=s.functions.end())
+               global_err_node = i->second;
+       else
+       {
+               for(auto j=s.content.body.begin(); (!global_err_node && j!=s.content.body.end()); ++j)
+                       if((*j)->source>0)
+                               global_err_node = j->get();
+       }
+
+       if(s.type==Stage::TESS_CONTROL)
+       {
+               if(!have_output_vertex_count)
+                       error(*global_err_node, "No vertex count qualifier found on output");
+       }
+       else if(s.type==Stage::TESS_EVAL)
+       {
+               if(!have_input_primitive)
+                       error(*global_err_node, "No primitive type qualifier found on input");
+       }
+       else if(s.type==Stage::GEOMETRY)
+       {
+               if(!have_input_primitive)
+                       error(*global_err_node, "No primitive type qualifier found on input");
+               if(!have_output_primitive)
+                       error(*global_err_node, "No primitive type qualifier found on output");
+               if(!have_output_vertex_count)
+                       error(*global_err_node, "No vertex count qualifier found on output");
+       }
+       else if(s.type==Stage::COMPUTE)
+       {
+               if(!have_workgroup_size)
+                       error(*global_err_node, "No workgroup size qualifier found");
+       }
+}
 
 const char *DeclarationValidator::describe_variable(ScopeType scope)
 {
@@ -60,27 +92,39 @@ const char *DeclarationValidator::describe_variable(ScopeType scope)
 
 void DeclarationValidator::visit(Layout &layout)
 {
-       for(vector<Layout::Qualifier>::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i)
+       bool push_constant = false;
+       bool binding = false;
+       for(const Layout::Qualifier &q: layout.qualifiers)
        {
                bool allowed = false;
                string err_descr;
                bool value = true;
-               if(i->name=="location")
+               if(q.name=="location")
                        allowed = (variable && scope==GLOBAL);
-               else if(i->name=="binding" || i->name=="set")
+               else if(q.name=="binding" || q.name=="set")
                {
+                       binding = true;
+
+                       if(q.name=="set" && features.target_api!=VULKAN)
+                       {
+                               error(layout, "Layout qualifier 'set' not allowed when targeting OpenGL");
+                               continue;
+                       }
+
                        if(variable)
                        {
-                               TypeDeclaration *type = variable->type_declaration;
-                               while(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(type))
-                                       type = basic->base_type;
-                               allowed = (scope==GLOBAL && dynamic_cast<ImageTypeDeclaration *>(type));
-                               err_descr = "variable of non-opaque type";
+                               const TypeDeclaration *base_type = get_ultimate_base_type(variable->type_declaration);
+                               bool uniform = (variable->interface=="uniform");
+                               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)
-                               allowed = true;
+                       {
+                               allowed = (iface_block->interface=="uniform");
+                               err_descr = "non-uniform interface block";
+                       }
                }
-               else if(i->name=="constant_id")
+               else if(q.name=="constant_id")
                {
                        allowed = (variable && scope==GLOBAL);
                        if(allowed)
@@ -102,32 +146,113 @@ void DeclarationValidator::visit(Layout &layout)
                                }
                        }
                }
-               else if(i->name=="offset")
-                       allowed = (variable && scope==INTERFACE_BLOCK);
-               else if(i->name=="points")
+               else if(q.name=="offset")
+                       allowed = (variable && scope==INTERFACE_BLOCK && iface_block->interface=="uniform");
+               else if(q.name=="align")
+                       allowed = (scope==INTERFACE_BLOCK && iface_block->interface=="uniform");
+               else if(q.name=="points")
                {
                        allowed = (stage->type==Stage::GEOMETRY && iface_layout && (iface_layout->interface=="in" || iface_layout->interface=="out"));
                        value = false;
+                       if(allowed)
+                       {
+                               if(iface_layout->interface=="in")
+                                       have_input_primitive = true;
+                               else if(iface_layout->interface=="out")
+                                       have_output_primitive = true;
+                       }
+               }
+               else if(q.name=="triangles")
+               {
+                       allowed = ((stage->type==Stage::GEOMETRY || stage->type==Stage::TESS_EVAL) && iface_layout && iface_layout->interface=="in");
+                       value = false;
+                       if(allowed)
+                               have_input_primitive = true;
                }
-               else if(i->name=="lines" || i->name=="lines_adjacency" || i->name=="triangles" || i->name=="triangles_adjacency")
+               else if(q.name=="lines" || q.name=="lines_adjacency" || q.name=="triangles_adjacency")
                {
                        allowed = (stage->type==Stage::GEOMETRY && iface_layout && iface_layout->interface=="in");
                        value = false;
+                       if(allowed)
+                               have_input_primitive = true;
+               }
+               else if(q.name=="quads" || q.name=="isolines")
+               {
+                       allowed = (stage->type==Stage::TESS_EVAL && iface_layout && iface_layout->interface=="in");
+                       value = false;
+                       if(allowed)
+                               have_input_primitive = true;
                }
-               else if(i->name=="line_strip" || i->name=="triangle_strip")
+               else if(q.name=="line_strip" || q.name=="triangle_strip")
                {
                        allowed = (stage->type==Stage::GEOMETRY && iface_layout && iface_layout->interface=="out");
                        value = false;
+                       if(allowed)
+                               have_output_primitive = true;
                }
-               else if(i->name=="invocations")
+               else if(q.name=="invocations")
                        allowed = (stage->type==Stage::GEOMETRY && iface_layout && iface_layout->interface=="in");
-               else if(i->name=="max_vertices")
+               else if(q.name=="max_vertices")
+               {
                        allowed = (stage->type==Stage::GEOMETRY && iface_layout && iface_layout->interface=="out");
-               else if(i->name=="std140" || i->name=="std430")
+                       if(allowed)
+                               have_output_vertex_count = true;
+               }
+               else if(q.name=="vertices")
                {
+                       allowed = (stage->type==Stage::TESS_CONTROL && iface_layout && iface_layout->interface=="out");
+                       if(allowed)
+                               have_output_vertex_count = true;
+               }
+               else if(q.name=="cw" || q.name=="ccw" ||
+                       q.name=="equal_spacing" || q.name=="fractional_even_spacing" || q.name=="fractional_odd_spacing")
+               {
+                       allowed = (stage->type==Stage::TESS_EVAL && iface_layout && iface_layout->interface=="in");
+                       value = false;
+               }
+               else if(q.name=="std140" || q.name=="std430")
+               {
+                       allowed = (iface_block && !variable && iface_block->interface=="uniform");
+                       value = false;
+               }
+               else if(q.name=="column_major" || q.name=="row_major")
+               {
+                       allowed = (variable && scope==INTERFACE_BLOCK);
+                       if(allowed)
+                       {
+                               BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(variable->type_declaration);
+                               while(basic && basic->kind==BasicTypeDeclaration::ARRAY)
+                                       basic = dynamic_cast<BasicTypeDeclaration *>(basic->base_type);
+                               allowed = (basic && basic->kind==BasicTypeDeclaration::MATRIX);
+                               err_descr = "non-matrix variable";
+                       }
+               }
+               else if(q.name=="push_constant")
+               {
+                       push_constant = true;
                        allowed = (iface_block && !variable && iface_block->interface=="uniform");
                        value = false;
                }
+               else if(q.name=="local_size_x" || q.name=="local_size_y" || q.name=="local_size_z")
+               {
+                       allowed = (stage->type==Stage::COMPUTE && iface_layout && iface_layout->interface=="in");
+                       if(allowed)
+                               have_workgroup_size = true;
+               }
+               else if(q.name=="rgba32f" || q.name=="rgba16f" || q.name=="rg32f" || q.name=="rg16f" || q.name=="r32f" || q.name=="r16f" ||
+                       q.name=="rgba16" || q.name=="rgba8" || q.name=="rg16" || q.name=="rg8" || q.name=="r16" || q.name=="r8" ||
+                       q.name=="rgba16_snorm" || q.name=="rgba8_snorm" || q.name=="rg16_snorm" || q.name=="rg8_snorm" || q.name=="r16_snorm" || q.name=="r8_snorm")
+               {
+                       allowed = variable;
+                       value = false;
+                       if(allowed)
+                       {
+                               const TypeDeclaration *base_type = get_ultimate_base_type(variable->type_declaration);
+                               const ImageTypeDeclaration *image = dynamic_cast<const ImageTypeDeclaration *>(base_type);
+                               allowed = (image && !image->sampled);
+                               err_descr = (image ? "sampled image" : "non-image variable");
+                       }
+               }
 
                if(!allowed)
                {
@@ -142,13 +267,16 @@ void DeclarationValidator::visit(Layout &layout)
                                else
                                        err_descr = "unknown declaration";
                        }
-                       error(layout, format("Layout qualifier '%s' not allowed on %s", i->name, err_descr));
+                       error(layout, format("Layout qualifier '%s' not allowed on %s", q.name, err_descr));
                }
-               else if(value && !i->has_value)
-                       error(layout, format("Layout qualifier '%s' requires a value", i->name));
-               else if(!value && i->has_value)
-                       error(layout, format("Layout qualifier '%s' does not allow a value", i->name));
+               else if(value && !q.has_value)
+                       error(layout, format("Layout qualifier '%s' requires a value", q.name));
+               else if(!value && q.has_value)
+                       error(layout, format("Layout qualifier '%s' does not allow a value", q.name));
        }
+
+       if(push_constant && binding)
+               error(layout, "Layout qualifier 'push_constant' not allowed together with 'binding' or 'set'");
 }
 
 void DeclarationValidator::visit(InterfaceLayout &layout)
@@ -181,13 +309,14 @@ void DeclarationValidator::visit(ImageTypeDeclaration &type)
 
 void DeclarationValidator::visit(StructDeclaration &strct)
 {
-       SetForScope<ScopeType> set_scope(scope, (scope!=INTERFACE_BLOCK ? STRUCT : scope));
+       SetForScope<ScopeType> set_scope(scope, (strct.block_name.empty() ? STRUCT : INTERFACE_BLOCK));
+       SetForScope<VariableDeclaration *> set_iface(iface_block, strct.block_declaration);
        TraversingVisitor::visit(strct);
 }
 
 void DeclarationValidator::visit(VariableDeclaration &var)
 {
-       SetForScope<VariableDeclaration *> set_var(variable, &var);
+       SetForScope<VariableDeclaration *> set_var((var.block_declaration ? iface_block : variable), &var);
 
        const char *descr = describe_variable(scope);
 
@@ -203,16 +332,22 @@ void DeclarationValidator::visit(VariableDeclaration &var)
        {
                if(scope==STRUCT || scope==INTERFACE_BLOCK)
                        error(var, format("Constant qualifier not allowed on %s", descr));
+               if(!var.init_expression)
+                       error(var, "Constant variable must have an initializer");
        }
 
        if(!var.interpolation.empty() || !var.sampling.empty())
        {
-               if(var.interface!="in" && stage->type==Stage::VERTEX)
+               if(var.interface=="in" && stage->type==Stage::VERTEX)
                        error(var, "Interpolation qualifier not allowed on vertex input");
-               else if(var.interface!="out" && stage->type==Stage::FRAGMENT)
+               else if(var.interface=="out" && stage->type==Stage::FRAGMENT)
                        error(var, "Interpolation qualifier not allowed on fragment output");
                else if((var.interface!="in" && var.interface!="out") || (scope==FUNCTION_PARAM || scope==FUNCTION))
                        error(var, "Interpolation qualifier not allowed on non-interpolated variable");
+               else if(var.sampling=="patch" && (stage->type!=Stage::TESS_CONTROL || var.interface!="out") && (stage->type!=Stage::TESS_EVAL || var.interface!="in"))
+                       error(var, "Per-patch variables only allowed on tessellation control output or tessellation evaluation input");
+               if(var.sampling=="patch" && !var.interpolation.empty())
+                       error(var, "Interpolation qualifier not allowed on per-patch variable");
        }
 
        if(!var.interface.empty())
@@ -221,11 +356,20 @@ 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 && var.interface=="uniform" && !var.block_declaration && features.target_api==VULKAN)
+               {
+                       if(!dynamic_cast<const ImageTypeDeclaration *>(get_ultimate_base_type(var.type_declaration)))
+                               error(var, "Interface qualifier 'uniform' not allowed on non-opaque variable in global scope");
+               }
        }
 
        TypeDeclaration *type = var.type_declaration;
+       BasicTypeDeclaration::Kind kind = BasicTypeDeclaration::ALIAS;
        while(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(type))
+       {
+               kind = basic->kind;
                type = basic->base_type;
+       }
        if(dynamic_cast<ImageTypeDeclaration *>(type))
        {
                if(scope!=GLOBAL && scope!=FUNCTION_PARAM)
@@ -233,6 +377,25 @@ void DeclarationValidator::visit(VariableDeclaration &var)
                else if(scope==GLOBAL && var.interface!="uniform")
                        error(var, format("Type '%s' only allowed with uniform interface", type->name));
        }
+       else if(var.block_declaration)
+       {
+               if(stage->type==Stage::VERTEX && var.interface=="in")
+                       error(var, "Interface block not allowed on vertex shader input");
+               else if(stage->type==Stage::FRAGMENT && var.interface=="out")
+                       error(var, "Interface block not allowed on fragment shader output");
+       }
+       else if(kind==BasicTypeDeclaration::VOID)
+               error(var, "Type 'void' not allowed on variable");
+       else if(kind==BasicTypeDeclaration::BOOL && var.source!=BUILTIN_SOURCE)
+       {
+               if(scope==INTERFACE_BLOCK)
+                       error(var, "Type 'bool' not allowed in an interface block");
+               else if(!var.interface.empty())
+                       error(var, "Type 'bool' not allowed on interface variable");
+       }
+
+       if(var.array && !var.array_size)
+               error(var, "Array must have a size");
 
        if(var.init_expression)
        {
@@ -245,35 +408,16 @@ void DeclarationValidator::visit(VariableDeclaration &var)
        }
 }
 
-void DeclarationValidator::visit(InterfaceBlock &iface)
-{
-       SetForScope<ScopeType> set_scope(scope, INTERFACE_BLOCK);
-       SetForScope<InterfaceBlock *> set_iface(iface_block, &iface);
-
-       if(stage->type==Stage::VERTEX && iface.interface=="in")
-               error(iface, "Interface block not allowed on vertex shader input");
-       else if(stage->type==Stage::FRAGMENT && iface.interface=="out")
-               error(iface, "Interface block not allowed on fragment shader output");
-
-       TraversingVisitor::visit(iface);
-       if(iface.struct_declaration)
-               iface.struct_declaration->visit(*this);
-}
-
 void DeclarationValidator::visit(FunctionDeclaration &func)
 {
        SetForScope<ScopeType> set_scope(scope, FUNCTION_PARAM);
-       for(NodeArray<VariableDeclaration>::const_iterator i=func.parameters.begin(); i!=func.parameters.end(); ++i)
-               (*i)->visit(*this);
+       for(const RefPtr<VariableDeclaration> &p: func.parameters)
+               p->visit(*this);
        scope = FUNCTION;
        func.body.visit(*this);
 }
 
 
-IdentifierValidator::IdentifierValidator():
-       anonymous_block(false)
-{ }
-
 void IdentifierValidator::multiple_definition(const string &name, Statement &statement, Statement &previous)
 {
        error(statement, format("Multiple definition of %s", name));
@@ -283,7 +427,7 @@ void IdentifierValidator::multiple_definition(const string &name, Statement &sta
 Statement *IdentifierValidator::find_definition(const string &name)
 {
        BlockDeclarationMap *decls = &declarations[current_block];
-       BlockDeclarationMap::const_iterator i = decls->find(name);
+       auto i = decls->find(name);
        if(i==decls->end() && anonymous_block)
        {
                decls = &declarations[current_block->parent];
@@ -309,54 +453,55 @@ void IdentifierValidator::record_definition(const string &name, Statement &state
 
 void IdentifierValidator::visit(TypeDeclaration &type)
 {
-       check_definition(type.name, type);
+       if(type.source!=INTERNAL_SOURCE)
+               check_definition(type.name, type);
 }
 
 void IdentifierValidator::visit(StructDeclaration &strct)
 {
-       check_definition(strct.name, strct);
+       if(strct.block_name.empty())
+               check_definition(strct.name, strct);
        TraversingVisitor::visit(strct);
 }
 
 void IdentifierValidator::visit(VariableDeclaration &var)
 {
-       check_definition(var.name, var);
-       TraversingVisitor::visit(var);
-}
+       if(var.block_declaration)
+       {
+               string key = format("%s %s", var.interface, var.block_declaration->block_name);
+               auto i = interface_blocks.find(key);
+               if(i!=interface_blocks.end())
+                       multiple_definition(format("interface block '%s %s'", var.interface, var.block_declaration->block_name), var, *i->second);
+               else
+                       interface_blocks.insert(make_pair(key, &var));
 
-void IdentifierValidator::visit(InterfaceBlock &iface)
-{
-       string key = iface.interface+iface.block_name;
-       map<string, InterfaceBlock *>::const_iterator i = interface_blocks.find(key);
-       if(i!=interface_blocks.end())
-               multiple_definition(format("interface block '%s %s'", iface.interface, iface.block_name), iface, *i->second);
-       else
-               interface_blocks.insert(make_pair(key, &iface));
+               if(Statement *previous = find_definition(var.block_declaration->block_name))
+               {
+                       const VariableDeclaration *prev_var = dynamic_cast<const VariableDeclaration *>(previous);
+                       if(!prev_var || !prev_var->block_declaration)
+                               multiple_definition(format("'%s'", var.block_declaration->block_name), var, *previous);
+               }
+               else
+                       record_definition(var.block_declaration->block_name, var);
 
-       if(Statement *previous = find_definition(iface.block_name))
-       {
-               if(!dynamic_cast<InterfaceBlock *>(previous))
-                       multiple_definition(format("'%s'", iface.block_name), iface, *previous);
+               if(var.name.find(' ')!=string::npos)
+               {
+                       // Inject anonymous interface block members into the global scope
+                       for(const auto &kvp: var.block_declaration->members.variables)
+                               check_definition(kvp.first, *kvp.second);
+               }
        }
-       else
-               record_definition(iface.block_name, iface);
 
-       if(!iface.instance_name.empty())
-               check_definition(iface.instance_name, iface);
+       if(var.name.find(' ')==string::npos)
+               check_definition(var.name, var);
 
-       if(iface.instance_name.empty() && iface.struct_declaration)
-       {
-               // Inject anonymous interface block members into the global scope
-               const map<string, VariableDeclaration *> &iface_vars = iface.struct_declaration->members.variables;
-               for(map<string, VariableDeclaration *>::const_iterator j=iface_vars.begin(); j!=iface_vars.end(); ++j)
-                       check_definition(j->first, *j->second);
-       }
+       TraversingVisitor::visit(var);
 }
 
 void IdentifierValidator::visit(FunctionDeclaration &func)
 {
        string key = func.name+func.signature;
-       map<string, FunctionDeclaration *>::const_iterator i = overloaded_functions.find(key);
+       auto i = overloaded_functions.find(key);
        if(i==overloaded_functions.end())
                overloaded_functions.insert(make_pair(key, &func));
        else if(func.return_type_declaration && i->second->return_type_declaration!=func.return_type_declaration)
@@ -398,7 +543,7 @@ void ReferenceValidator::visit(VariableReference &var)
        if(!var.declaration)
                error(var, format("Use of undeclared variable '%s'", var.name));
        else if(stage->type!=Stage::VERTEX && var.declaration->interface=="in" && var.name.compare(0, 3, "gl_") && !var.declaration->linked_declaration)
-               error(var, format("Use of unlinked input variable '%s'", var.name));
+               error(var, format("Use of unlinked input %s '%s'", (var.declaration->block_declaration ? "block" : "variable"), var.name));
 }
 
 void ReferenceValidator::visit(MemberAccess &memacc)
@@ -408,16 +553,6 @@ void ReferenceValidator::visit(MemberAccess &memacc)
        TraversingVisitor::visit(memacc);
 }
 
-void ReferenceValidator::visit(InterfaceBlockReference &iface)
-{
-       /* An interface block reference without a declaration should be impossible
-       since references are generated based on existing declarations. */
-       if(!iface.declaration)
-               error(iface, format("Use of undeclared interface block '%s'", iface.name));
-       else if(stage->type!=Stage::VERTEX && iface.declaration->interface=="in" && !iface.declaration->linked_block)
-               error(iface, format("Use of unlinked input block '%s'", iface.name));
-}
-
 void ReferenceValidator::visit(FunctionCall &call)
 {
        if((!call.constructor && !call.declaration) || (call.constructor && !call.type))
@@ -425,7 +560,7 @@ void ReferenceValidator::visit(FunctionCall &call)
                bool have_declaration = call.constructor;
                if(!call.constructor)
                {
-                       map<string, FunctionDeclaration *>::iterator i = stage->functions.lower_bound(call.name);
+                       auto i = stage->functions.lower_bound(call.name);
                        have_declaration = (i!=stage->functions.end() && i->second->name==call.name);
                }
 
@@ -433,7 +568,7 @@ void ReferenceValidator::visit(FunctionCall &call)
                {
                        bool valid_types = true;
                        string signature;
-                       for(NodeArray<Expression>::const_iterator j=call.arguments.begin(); (valid_types && j!=call.arguments.end()); ++j)
+                       for(auto j=call.arguments.begin(); (valid_types && j!=call.arguments.end()); ++j)
                        {
                                if((*j)->type)
                                        append(signature, ", ", (*j)->type->name);
@@ -457,13 +592,6 @@ void ReferenceValidator::visit(VariableDeclaration &var)
        TraversingVisitor::visit(var);
 }
 
-void ReferenceValidator::visit(InterfaceBlock &iface)
-{
-       if(!iface.struct_declaration)
-               error(iface, format("Interface block '%s %s' lacks a struct declaration", iface.interface, iface.block_name));
-       TraversingVisitor::visit(iface);
-}
-
 void ReferenceValidator::visit(FunctionDeclaration &func)
 {
        if(!func.return_type_declaration)
@@ -472,9 +600,22 @@ void ReferenceValidator::visit(FunctionDeclaration &func)
 }
 
 
-ExpressionValidator::ExpressionValidator():
-       current_function(0)
-{ }
+void ExpressionValidator::visit(VariableReference &var)
+{
+       if(var.declaration && constant_expression)
+       {
+               if(!var.declaration->constant)
+               {
+                       const char *kind = (var.declaration->block_declaration ? "interface block" : "non-constant variable");
+                       error(var, format("Reference to %s '%s' in a constant expression", kind, var.name));
+               }
+               else if(var.declaration->layout && constant_expression==FIXED_CONSTANT)
+               {
+                       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));
+               }
+       }
+}
 
 void ExpressionValidator::visit(Swizzle &swizzle)
 {
@@ -493,7 +634,7 @@ void ExpressionValidator::visit(Swizzle &swizzle)
                int flavour = -1;
                for(unsigned i=0; i<swizzle.count; ++i)
                {
-                       unsigned component_flavour = (find(component_names, component_names+12, swizzle.component_group[i])-component_names)/4;
+                       unsigned component_flavour = (std::find(component_names, component_names+12, swizzle.component_group[i])-component_names)/4;
                        if(flavour==-1)
                                flavour = component_flavour;
                        else if(flavour>=0 && component_flavour!=static_cast<unsigned>(flavour))
@@ -520,8 +661,13 @@ void ExpressionValidator::visit(UnaryExpression &unary)
        {
                if(!unary.type)
                        error(unary, format("No matching operator '%s' found for '%s'", unary.oper->token, unary.expression->type->name));
-               else if((unary.oper->token[1]=='+' || unary.oper->token[1]=='-') && !unary.expression->lvalue)
-                       error(unary, format("Operand of '%s' is not an lvalue", unary.oper->token));
+               else if(unary.oper->token[1]=='+' || unary.oper->token[1]=='-')
+               {
+                       if(constant_expression)
+                               error(unary, format("Use of '%s' in a constant expression", unary.oper->token));
+                       else if(!unary.expression->lvalue)
+                               error(unary, format("Operand of '%s' is not an lvalue", unary.oper->token));
+               }
        }
        TraversingVisitor::visit(unary);
 }
@@ -544,7 +690,9 @@ void ExpressionValidator::visit(Assignment &assign)
 {
        if(assign.left->type)
        {
-               if(!assign.left->lvalue)
+               if(constant_expression)
+                       error(assign, "Assignment in constant expression");
+               else if(!assign.left->lvalue)
                        error(assign, "Target of assignment is not an lvalue");
                if(assign.right->type)
                {
@@ -576,12 +724,33 @@ void ExpressionValidator::visit(TernaryExpression &ternary)
        TraversingVisitor::visit(ternary);
 }
 
+void ExpressionValidator::visit(StructDeclaration &strct)
+{
+       SetFlag set_struct(in_struct);
+       TraversingVisitor::visit(strct);
+}
+
 void ExpressionValidator::visit(VariableDeclaration &var)
 {
        if(var.init_expression && var.init_expression->type && var.type_declaration && var.init_expression->type!=var.type_declaration)
                error(var, format("Initializing a variable of type '%s' with an expression of incompatible type '%s'",
                        var.type_declaration->name, var.init_expression->type->name));
-       TraversingVisitor::visit(var);
+
+       if(var.layout)
+               var.layout->visit(*this);
+       if(var.init_expression)
+       {
+               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);
+       }
+       if(var.array_size)
+       {
+               SetForScope<ConstantKind> set_const(constant_expression, (in_struct || !var.interface.empty() ? FIXED_CONSTANT : SPEC_CONSTANT));
+               TraversingVisitor::visit(var.array_size);
+       }
 }
 
 void ExpressionValidator::visit(FunctionDeclaration &func)
@@ -590,6 +759,28 @@ void ExpressionValidator::visit(FunctionDeclaration &func)
        TraversingVisitor::visit(func);
 }
 
+void ExpressionValidator::visit(Conditional &cond)
+{
+       if(cond.condition->type)
+       {
+               BasicTypeDeclaration *basic_cond = dynamic_cast<BasicTypeDeclaration *>(cond.condition->type);
+               if(!basic_cond || basic_cond->kind!=BasicTypeDeclaration::BOOL)
+                       error(cond, "Condition is not a boolean");
+       }
+       TraversingVisitor::visit(cond);
+}
+
+void ExpressionValidator::visit(Iteration &iter)
+{
+       if(iter.condition->type)
+       {
+               BasicTypeDeclaration *basic_cond = dynamic_cast<BasicTypeDeclaration *>(iter.condition->type);
+               if(!basic_cond || basic_cond->kind!=BasicTypeDeclaration::BOOL)
+                       error(iter, "Loop condition is not a boolean");
+       }
+       TraversingVisitor::visit(iter);
+}
+
 void ExpressionValidator::visit(Return &ret)
 {
        if(current_function && current_function->return_type_declaration)
@@ -609,6 +800,209 @@ void ExpressionValidator::visit(Return &ret)
        TraversingVisitor::visit(ret);
 }
 
+
+void FlowControlValidator::visit(Block &block)
+{
+       for(const RefPtr<Statement> &s: block.body)
+       {
+               if(!reachable)
+               {
+                       diagnose(*s, Diagnostic::WARN, "Unreachable code detected");
+                       break;
+               }
+               s->visit(*this);
+       }
+}
+
+void FlowControlValidator::visit(FunctionDeclaration &func)
+{
+       func.body.visit(*this);
+
+       if(func.definition==&func && func.return_type_declaration)
+       {
+               const BasicTypeDeclaration *basic_ret = dynamic_cast<const BasicTypeDeclaration *>(func.return_type_declaration);
+               if(reachable && (!basic_ret || basic_ret->kind!=BasicTypeDeclaration::VOID))
+                       error(func, "Missing return statement at the end of a function not returning 'void'");
+       }
+       reachable = true;
+}
+
+void FlowControlValidator::visit(Conditional &cond)
+{
+       cond.body.visit(*this);
+       bool reachable_if_true = reachable;
+       reachable = true;
+       cond.else_body.visit(*this);
+       reachable |= reachable_if_true;
+}
+
+void FlowControlValidator::visit(Iteration &iter)
+{
+       iter.body.visit(*this);
+       reachable = true;
+}
+
+
+void StageInterfaceValidator::visit(VariableDeclaration &var)
+{
+       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 = get_layout_value(linked_layout, "location");
+               if(linked_location!=location)
+               {
+                       error(var, format("Mismatched location %d for 'in %s'", location, var.name));
+                       add_info(*var.linked_declaration, format("Linked to 'out %s' with location %d",
+                               var.linked_declaration->name, linked_location));
+               }
+               if(var.type_declaration && var.linked_declaration->type_declaration)
+               {
+                       TypeDeclaration *type = var.type_declaration;
+                       if(stage->type==Stage::TESS_CONTROL || stage->type==Stage::GEOMETRY)
+                       {
+                               if(const BasicTypeDeclaration *basic = dynamic_cast<const BasicTypeDeclaration *>(type))
+                                       if(basic->kind==BasicTypeDeclaration::ARRAY && basic->base_type)
+                                               type = basic->base_type;
+                       }
+                       if(!TypeComparer().apply(*type, *var.linked_declaration->type_declaration))
+                       {
+                               error(var, format("Mismatched type '%s' for 'in %s'", type->name, var.name));
+                               add_info(*var.linked_declaration, format("Linked to 'out %s' with type '%s'",
+                                       var.linked_declaration->name, var.linked_declaration->type_declaration->name));
+                       }
+               }
+               if((var.sampling=="patch") != (var.linked_declaration->sampling=="patch"))
+               {
+                       error(var, format("Mismatched sampling qualifier '%s' for 'in %s'", var.sampling, var.name));
+                       add_info(*var.linked_declaration, format("Linked to 'out %s' qualified as '%s'",
+                               var.linked_declaration->name, var.linked_declaration->sampling));
+               }
+       }
+
+       if(location>=0 && !var.interface.empty())
+       {
+               map<unsigned, VariableDeclaration *> &used = used_locations[var.interface];
+
+               unsigned loc_count = LocationCounter().apply(var);
+               for(unsigned i=0; i<loc_count; ++i)
+               {
+                       auto j = used.find(location+i);
+                       if(j!=used.end())
+                       {
+                               error(var, format("Overlapping location %d for '%s %s'", location+i, var.interface, var.name));
+                               add_info(*j->second, format("Previously used here for '%s %s'", j->second->interface, j->second->name));
+                       }
+                       else
+                               used[location+i] = &var;
+               }
+       }
+}
+
+
+void GlobalInterfaceValidator::apply(Module &module)
+{
+       for(Stage &s: module.stages)
+       {
+               stage = &s;
+               s.content.visit(*this);
+       }
+}
+
+void GlobalInterfaceValidator::check_uniform(const Uniform &uni)
+{
+       auto i = used_names.find(uni.name);
+       if(i!=used_names.end())
+       {
+               if(uni.location>=0 && i->second->location>=0 && i->second->location!=uni.location)
+               {
+                       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));
+                       add_info(*i->second->node, format("Previously declared here with binding %d", i->second->bind_point));
+               }
+               if(uni.type && i->second->type && !TypeComparer().apply(*uni.type, *i->second->type))
+               {
+                       string type_name = (dynamic_cast<const StructDeclaration *>(uni.type) ?
+                               "structure" : format("type '%s'", uni.type->name));
+                       error(*uni.node, format("Mismatched %s for uniform '%s'", type_name, uni.name));
+
+                       string message = "Previously declared here";
+                       if(!dynamic_cast<const StructDeclaration *>(i->second->type))
+                               message += format(" with type '%s'", i->second->type->name);
+                       add_info(*i->second->node, message);
+               }
+       }
+       else
+               used_names.insert(make_pair(uni.name, &uni));
+
+       if(uni.location>=0)
+       {
+               auto j = used_locations.find(uni.location);
+               if(j!=used_locations.end())
+               {
+                       if(j->second->name!=uni.name)
+                       {
+                               error(*uni.node, format("Overlapping location %d for '%s'", uni.location, uni.name));
+                               add_info(*j->second->node, format("Previously used here for '%s'", j->second->name));
+                       }
+               }
+               else
+               {
+                       for(unsigned k=0; k<uni.loc_count; ++k)
+                               used_locations.insert(make_pair(uni.location+k, &uni));
+               }
+       }
+
+       if(uni.bind_point>=0)
+       {
+               map<unsigned, const Uniform *> &used = used_bindings[uni.desc_set];
+               auto j = used.find(uni.bind_point);
+               if(j!=used.end())
+               {
+                       if(j->second->name!=uni.name)
+                       {
+                               error(*uni.node, format("Overlapping binding %d for '%s'", uni.bind_point, uni.name));
+                               add_info(*j->second->node, format("Previously used here for '%s'", j->second->name));
+                       }
+               }
+               else
+                       used.insert(make_pair(uni.bind_point, &uni));
+       }
+}
+
+void GlobalInterfaceValidator::visit(VariableDeclaration &var)
+{
+       if(var.interface=="uniform")
+       {
+               Uniform uni;
+               uni.node = &var;
+               uni.type = var.type_declaration;
+               uni.name = (var.block_declaration ? var.block_declaration->block_name : var.name);
+               if(var.layout)
+               {
+                       if(!var.block_declaration)
+                       {
+                               uni.location = get_layout_value(var.layout.get(), "location");
+                               uni.loc_count = LocationCounter().apply(var);
+                       }
+                       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);
+               check_uniform(uniforms.back());
+       }
+}
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp