for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
{
glsl += format("#pragma MSP stage(%s)\n", Stage::get_stage_name(i->type));
- glsl += Formatter().apply(*i, MODULE);
+ glsl += Formatter().apply(*i);
glsl += '\n';
}
{
for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
if(i->type==stage_type)
- return Formatter().apply(*i, PROGRAM);
+ return Formatter().apply(*i);
throw key_error(Stage::get_stage_name(stage_type));
}
target->required_features.glsl_version = stage.required_features.glsl_version;
for(NodeList<Statement>::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
target->content.body.push_back(*i);
- DeclarationCombiner().apply(*target);
}
void Compiler::import(DataFile::Collection *resources, const string &name)
else if(resolve<FunctionResolver>(stage, flags, RESOLVE_FUNCTIONS))
flags |= RESOLVE_EXPRESSIONS;
else if(resolve<ExpressionResolver>(stage, flags, RESOLVE_EXPRESSIONS))
- flags |= RESOLVE_VARIABLES;
+ flags |= RESOLVE_VARIABLES|RESOLVE_FUNCTIONS;
}
}
ReferenceValidator().apply(stage);
ExpressionValidator().apply(stage);
+ stable_sort(stage.diagnostics, &diagnostic_line_order);
+
for(vector<Diagnostic>::const_iterator i=stage.diagnostics.begin(); i!=stage.diagnostics.end(); ++i)
if(i->severity==Diagnostic::ERR)
return false;
return true;
}
+bool Compiler::diagnostic_line_order(const Diagnostic &diag1, const Diagnostic &diag2)
+{
+ if(diag1.provoking_source!=diag2.provoking_source)
+ {
+ // Sort builtins first and imported modules according to import order.
+ if(diag1.provoking_source<=BUILTIN_SOURCE)
+ return diag1.provoking_source<diag2.provoking_source;
+ else if(diag2.provoking_source<=BUILTIN_SOURCE)
+ return false;
+ else
+ return diag1.provoking_source>diag2.provoking_source;
+ }
+ return diag1.provoking_line<diag2.provoking_line;
+}
+
Compiler::OptimizeResult Compiler::optimize(Stage &stage)
{
ConstantConditionEliminator().apply(stage);
bool any_inlined = false;
if(FunctionInliner().apply(stage))
{
- resolve(stage, RESOLVE_TYPES|RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS);
+ resolve(stage, RESOLVE_TYPES|RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
any_inlined = true;
}
if(ExpressionInliner().apply(stage))
{
- resolve(stage, RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS);
+ resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
any_inlined = true;
}