X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=62f997bb5c29ad6d8a507620c3d78745118fc80f;hb=ea489c40680f9e8e90eeb163d17c8dddd53981d4;hp=154189aa2bc8c353398b9b92a6a521c47c5afe59;hpb=f2ad2730858046b08e8147297fa01bf3499b86a3;p=libs%2Fgl.git diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp index 154189aa..62f997bb 100644 --- a/source/glsl/validate.cpp +++ b/source/glsl/validate.cpp @@ -3,6 +3,7 @@ #include #include #include +#include "reflect.h" #include "validate.h" using namespace std; @@ -69,16 +70,26 @@ void DeclarationValidator::visit(Layout &layout) allowed = (variable && scope==GLOBAL); else if(i->name=="binding" || i->name=="set") { + if(i->name=="set") + { + error(layout, "Layout qualifier 'set' not allowed when targeting OpenGL"); + continue; + } + if(variable) { TypeDeclaration *type = variable->type_declaration; while(BasicTypeDeclaration *basic = dynamic_cast(type)) type = basic->base_type; - allowed = (scope==GLOBAL && dynamic_cast(type)); - err_descr = "variable of non-opaque type"; + bool uniform = (variable->interface=="uniform"); + allowed = (scope==GLOBAL && uniform && dynamic_cast(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") { @@ -103,7 +114,9 @@ void DeclarationValidator::visit(Layout &layout) } } else if(i->name=="offset") - allowed = (variable && scope==INTERFACE_BLOCK); + allowed = (variable && scope==INTERFACE_BLOCK && iface_block->interface=="uniform"); + else if(i->name=="align") + allowed = (scope==INTERFACE_BLOCK && iface_block->interface=="uniform"); else if(i->name=="points") { allowed = (stage->type==Stage::GEOMETRY && iface_layout && (iface_layout->interface=="in" || iface_layout->interface=="out")); @@ -128,6 +141,18 @@ void DeclarationValidator::visit(Layout &layout) allowed = (iface_block && !variable && iface_block->interface=="uniform"); value = false; } + else if(i->name=="column_major" || i->name=="row_major") + { + allowed = (variable && scope==INTERFACE_BLOCK); + if(allowed) + { + BasicTypeDeclaration *basic = dynamic_cast(variable->type_declaration); + while(basic && basic->kind==BasicTypeDeclaration::ARRAY) + basic = dynamic_cast(basic->base_type); + allowed = (basic && basic->kind==BasicTypeDeclaration::MATRIX); + err_descr = "non-matrix variable"; + } + } if(!allowed) { @@ -203,6 +228,8 @@ 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()) @@ -224,8 +251,12 @@ void DeclarationValidator::visit(VariableDeclaration &var) } TypeDeclaration *type = var.type_declaration; + BasicTypeDeclaration::Kind kind = BasicTypeDeclaration::ALIAS; while(BasicTypeDeclaration *basic = dynamic_cast(type)) + { + kind = basic->kind; type = basic->base_type; + } if(dynamic_cast(type)) { if(scope!=GLOBAL && scope!=FUNCTION_PARAM) @@ -233,6 +264,10 @@ 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(kind==BasicTypeDeclaration::VOID) + error(var, "Type 'void' not allowed on variable"); + else if(kind==BasicTypeDeclaration::BOOL && !var.interface.empty() && var.source!=BUILTIN_SOURCE) + error(var, "Type 'bool' not allowed on interface variable"); if(var.init_expression) { @@ -326,7 +361,7 @@ void IdentifierValidator::visit(VariableDeclaration &var) void IdentifierValidator::visit(InterfaceBlock &iface) { - string key = iface.interface+iface.block_name; + string key = format("%s %s", iface.interface, iface.block_name); map::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); @@ -473,9 +508,22 @@ void ReferenceValidator::visit(FunctionDeclaration &func) ExpressionValidator::ExpressionValidator(): - current_function(0) + current_function(0), + constant_expression(false) { } +void ExpressionValidator::visit(VariableReference &var) +{ + if(var.declaration && constant_expression && !var.declaration->constant) + error(var, format("Reference to non-constant variable '%s' in a constant expression", var.name)); +} + +void ExpressionValidator::visit(InterfaceBlockReference &iface) +{ + if(constant_expression) + error(iface, format("Reference to interface block '%s' in a constant expression", iface.name)); +} + void ExpressionValidator::visit(Swizzle &swizzle) { unsigned size = 0; @@ -520,8 +568,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 +597,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) { @@ -581,7 +636,19 @@ 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) + { + SetFlag set_const(constant_expression, var.constant); + TraversingVisitor::visit(var.init_expression); + } + if(var.array_size) + { + SetFlag set_const(constant_expression); + TraversingVisitor::visit(var.array_size); + } } void ExpressionValidator::visit(FunctionDeclaration &func) @@ -590,6 +657,28 @@ void ExpressionValidator::visit(FunctionDeclaration &func) TraversingVisitor::visit(func); } +void ExpressionValidator::visit(Conditional &cond) +{ + if(cond.condition->type) + { + BasicTypeDeclaration *basic_cond = dynamic_cast(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(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 +698,180 @@ void ExpressionValidator::visit(Return &ret) TraversingVisitor::visit(ret); } + +int StageInterfaceValidator::get_location(const Layout &layout) +{ + for(vector::const_iterator i=layout.qualifiers.begin(); i!=layout.qualifiers.end(); ++i) + if(i->name=="location") + return i->value; + return -1; +} + +void StageInterfaceValidator::visit(VariableDeclaration &var) +{ + int location = (var.layout ? get_location(*var.layout) : -1); + 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); + 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::GEOMETRY) + { + if(const BasicTypeDeclaration *basic = dynamic_cast(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(location>=0 && !var.interface.empty()) + { + map &used = used_locations[var.interface]; + + unsigned loc_count = LocationCounter().apply(var); + for(unsigned i=0; i::const_iterator 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(list::iterator i=module.stages.begin(); i!=module.stages.end(); ++i) + { + stage = &*i; + i->content.visit(*this); + } +} + +void GlobalInterfaceValidator::check_uniform(const Uniform &uni) +{ + map::const_iterator 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(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(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(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) + { + map::const_iterator 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=0) + { + map &used = used_bindings[uni.desc_set]; + map::const_iterator 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.name; + if(var.layout) + { + uni.location = get_layout_value(*var.layout, "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"); + } + + uniforms.push_back(uni); + check_uniform(uniforms.back()); + } +} + +void GlobalInterfaceValidator::visit(InterfaceBlock &iface) +{ + if(iface.interface=="uniform") + { + Uniform uni; + uni.node = &iface; + uni.type = iface.struct_declaration; + 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"); + } + + uniforms.push_back(uni); + check_uniform(uniforms.back()); + } +} + } // namespace SL } // namespace GL } // namespace Msp