X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fvalidate.cpp;h=883b950ff07f2e46d9aa0037ddfce2fa2719c425;hp=7d3d20d1c78eb104c85ac8ef511a099b5115ae5e;hb=HEAD;hpb=c7d1d96540688b7a853fa69d4ca45d968755a89c diff --git a/source/glsl/validate.cpp b/source/glsl/validate.cpp index 7d3d20d1..f6b11ef2 100644 --- a/source/glsl/validate.cpp +++ b/source/glsl/validate.cpp @@ -39,6 +39,42 @@ 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) @@ -118,21 +154,62 @@ void DeclarationValidator::visit(Layout &layout) { 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(q.name=="lines" || q.name=="lines_adjacency" || q.name=="triangles" || q.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(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(q.name=="invocations") allowed = (stage->type==Stage::GEOMETRY && iface_layout && iface_layout->interface=="in"); else if(q.name=="max_vertices") + { allowed = (stage->type==Stage::GEOMETRY && iface_layout && iface_layout->interface=="out"); + 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"); @@ -156,6 +233,26 @@ void DeclarationValidator::visit(Layout &layout) 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(base_type); + allowed = (image && !image->sampled); + err_descr = (image ? "sampled image" : "non-image variable"); + } + } if(!allowed) { @@ -212,13 +309,14 @@ void DeclarationValidator::visit(ImageTypeDeclaration &type) void DeclarationValidator::visit(StructDeclaration &strct) { - SetForScope set_scope(scope, (scope!=INTERFACE_BLOCK ? STRUCT : scope)); + SetForScope set_scope(scope, (strct.block_name.empty() ? STRUCT : INTERFACE_BLOCK)); + SetForScope set_iface(iface_block, strct.block_declaration); TraversingVisitor::visit(strct); } void DeclarationValidator::visit(VariableDeclaration &var) { - SetForScope set_var(variable, &var); + SetForScope set_var((var.block_declaration ? iface_block : variable), &var); const char *descr = describe_variable(scope); @@ -240,12 +338,16 @@ void DeclarationValidator::visit(VariableDeclaration &var) 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()) @@ -254,9 +356,9 @@ 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) + else if(scope==GLOBAL && var.interface=="uniform" && !var.block_declaration && features.target_api==VULKAN) { - if(!dynamic_cast(get_ultimate_base_type(variable->type_declaration))) + if(!dynamic_cast(get_ultimate_base_type(var.type_declaration))) error(var, "Interface qualifier 'uniform' not allowed on non-opaque variable in global scope"); } } @@ -275,6 +377,13 @@ 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) @@ -285,6 +394,9 @@ void DeclarationValidator::visit(VariableDeclaration &var) 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) { if(scope==GLOBAL && !var.constant) @@ -296,21 +408,6 @@ void DeclarationValidator::visit(VariableDeclaration &var) } } -void DeclarationValidator::visit(InterfaceBlock &iface) -{ - SetForScope set_scope(scope, INTERFACE_BLOCK); - SetForScope 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 set_scope(scope, FUNCTION_PARAM); @@ -356,47 +453,49 @@ 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 = format("%s %s", iface.interface, iface.block_name); - auto 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(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(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 - for(const auto &kvp: iface.struct_declaration->members.variables) - check_definition(kvp.first, *kvp.second); - } + TraversingVisitor::visit(var); } void IdentifierValidator::visit(FunctionDeclaration &func) @@ -444,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) @@ -454,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)) @@ -503,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) @@ -523,7 +605,10 @@ void ExpressionValidator::visit(VariableReference &var) if(var.declaration && constant_expression) { if(!var.declaration->constant) - error(var, format("Reference to non-constant variable '%s' in a constant expression", var.name)); + { + 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")) @@ -532,12 +617,6 @@ void ExpressionValidator::visit(VariableReference &var) } } -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; @@ -780,7 +859,7 @@ void StageInterfaceValidator::visit(VariableDeclaration &var) if(var.type_declaration && var.linked_declaration->type_declaration) { TypeDeclaration *type = var.type_declaration; - if(stage->type==Stage::GEOMETRY) + if(stage->type==Stage::TESS_CONTROL || stage->type==Stage::GEOMETRY) { if(const BasicTypeDeclaration *basic = dynamic_cast(type)) if(basic->kind==BasicTypeDeclaration::ARRAY && basic->base_type) @@ -793,6 +872,12 @@ void StageInterfaceValidator::visit(VariableDeclaration &var) 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()) @@ -901,11 +986,14 @@ void GlobalInterfaceValidator::visit(VariableDeclaration &var) Uniform uni; uni.node = &var; uni.type = var.type_declaration; - uni.name = var.name; + uni.name = (var.block_declaration ? var.block_declaration->block_name : var.name); if(var.layout) { - uni.location = get_layout_value(var.layout.get(), "location"); - uni.loc_count = LocationCounter().apply(var); + 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"); } @@ -915,25 +1003,6 @@ void GlobalInterfaceValidator::visit(VariableDeclaration &var) } } -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.get(), "set", 0); - uni.bind_point = get_layout_value(iface.layout.get(), "binding"); - } - - uniforms.push_back(uni); - check_uniform(uniforms.back()); - } -} - } // namespace SL } // namespace GL } // namespace Msp