s.interface_blocks.clear();
r_any_resolved = false;
s.content.visit(*this);
+ for(vector<VariableDeclaration *>::const_iterator i=redeclared_builtins.begin(); i!=redeclared_builtins.end(); ++i)
+ (*i)->source = GENERATED_SOURCE;
NodeRemover().apply(s, nodes_to_remove);
return r_any_resolved;
}
ptr = &var;
else if(!current_block->parent && ptr->interface==var.interface && ptr->type==var.type)
{
+ if(ptr->source==BUILTIN_SOURCE)
+ redeclared_builtins.push_back(&var);
+ else
+ stage->diagnostics.push_back(Diagnostic(Diagnostic::WARN, var.source, var.line,
+ format("Redeclaring non-builtin variable '%s' is deprecated", var.name)));
+
if(var.init_expression)
ptr->init_expression = var.init_expression;
if(var.layout)
vector<FunctionDeclaration *> &decls = declarations[key];
if(func.definition==&func)
{
+ if(stage_decl && stage_decl->definition)
+ {
+ if(!func.overrd)
+ stage->diagnostics.push_back(Diagnostic(Diagnostic::WARN, func.source, func.line,
+ format("Overriding function '%s' without the override keyword is deprecated", key)));
+ if(!stage_decl->definition->virtua)
+ stage->diagnostics.push_back(Diagnostic(Diagnostic::WARN, func.source, func.line,
+ format("Overriding function '%s' not declared as virtual is deprecated", key)));
+ }
stage_decl = &func;
// Set all previous declarations to use this definition.
}
else if(var.interface=="in" && current_block==&stage->content)
{
- declared_inputs.push_back(&var);
+ if(var.name.compare(0, 3, "gl_"))
+ declared_inputs.push_back(&var);
/* Try to link input variables in global scope with output variables from
previous stage. */