namespace GL {
namespace SL {
-void DeclarationCombiner::apply(Stage &stage)
-{
- stage.content.visit(*this);
- NodeRemover().apply(stage, nodes_to_remove);
-}
-
-void DeclarationCombiner::visit(Block &block)
-{
- if(current_block)
- return;
-
- TraversingVisitor::visit(block);
-}
-
-void DeclarationCombiner::visit(VariableDeclaration &var)
-{
- VariableDeclaration *&ptr = variables[var.name];
- if(ptr)
- {
- ptr->type = var.type;
- if(var.init_expression)
- ptr->init_expression = var.init_expression;
- if(var.layout)
- {
- if(ptr->layout)
- {
- for(vector<Layout::Qualifier>::iterator i=var.layout->qualifiers.begin(); i!=var.layout->qualifiers.end(); ++i)
- {
- bool found = false;
- for(vector<Layout::Qualifier>::iterator j=ptr->layout->qualifiers.begin(); (!found && j!=ptr->layout->qualifiers.end()); ++j)
- if(j->name==i->name)
- {
- j->has_value = i->value;
- j->value = i->value;
- found = true;
- }
-
- if(!found)
- ptr->layout->qualifiers.push_back(*i);
- }
- }
- else
- ptr->layout = var.layout;
- }
- nodes_to_remove.insert(&var);
- }
- else
- ptr = &var;
-}
-
-
ConstantSpecializer::ConstantSpecializer():
values(0)
{ }
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;
}
assign.self_referencing = (r_self_referencing || assign.oper->token[0]!='=');
}
+void VariableResolver::merge_layouts(Layout &to_layout, const Layout &from_layout)
+{
+ for(vector<Layout::Qualifier>::const_iterator i=from_layout.qualifiers.begin(); i!=from_layout.qualifiers.end(); ++i)
+ {
+ bool found = false;
+ for(vector<Layout::Qualifier>::iterator j=to_layout.qualifiers.begin(); (!found && j!=to_layout.qualifiers.end()); ++j)
+ if(j->name==i->name)
+ {
+ j->has_value = i->value;
+ j->value = i->value;
+ found = true;
+ }
+
+ if(!found)
+ to_layout.qualifiers.push_back(*i);
+ }
+}
+
void VariableResolver::visit(VariableDeclaration &var)
{
TraversingVisitor::visit(var);
- current_block->variables.insert(make_pair(var.name, &var));
+ VariableDeclaration *&ptr = current_block->variables[var.name];
+ if(!ptr)
+ 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)
+ {
+ if(ptr->layout)
+ merge_layouts(*ptr->layout, *var.layout);
+ else
+ ptr->layout = var.layout;
+ }
+ nodes_to_remove.insert(&var);
+
+ r_any_resolved = true;
+ }
}
void VariableResolver::visit(InterfaceBlock &iface)
resolve(literal, find_type(BasicTypeDeclaration::FLOAT, 32), false);
}
-void ExpressionResolver::visit(ParenthesizedExpression &parexpr)
-{
- TraversingVisitor::visit(parexpr);
- resolve(parexpr, parexpr.expression->type, parexpr.expression->lvalue);
-}
-
void ExpressionResolver::visit(VariableReference &var)
{
if(var.declaration)
void FunctionResolver::visit(FunctionCall &call)
{
- string arg_types;
- bool has_signature = true;
- for(NodeArray<Expression>::const_iterator i=call.arguments.begin(); (has_signature && i!=call.arguments.end()); ++i)
- {
- if((*i)->type)
- append(arg_types, ",", (*i)->type->name);
- else
- has_signature = false;
- }
-
FunctionDeclaration *declaration = 0;
- if(has_signature)
+ if(stage->types.count(call.name))
+ call.constructor = true;
+ else
{
- map<string, FunctionDeclaration *>::iterator i = stage->functions.find(format("%s(%s)", call.name, arg_types));
- declaration = (i!=stage->functions.end() ? i->second : 0);
+ string arg_types;
+ bool has_signature = true;
+ for(NodeArray<Expression>::const_iterator i=call.arguments.begin(); (has_signature && i!=call.arguments.end()); ++i)
+ {
+ if((*i)->type)
+ append(arg_types, ",", (*i)->type->name);
+ else
+ has_signature = false;
+ }
+
+ if(has_signature)
+ {
+ map<string, FunctionDeclaration *>::iterator i = stage->functions.find(format("%s(%s)", call.name, arg_types));
+ declaration = (i!=stage->functions.end() ? i->second : 0);
+ }
}
+
r_any_resolved |= (declaration!=call.declaration);
call.declaration = declaration;
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. */