throw invalid_shader_source(get_diagnostics());
unsigned n = 0;
- for(list<Stage>::iterator i=module->stages.begin(); (i!=module->stages.end() && n<10000); ++n)
+ for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++n)
{
OptimizeResult result = optimize(*i);
if(result==REDO_PREVIOUS)
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));
}
string combined;
for(list<Stage>::const_iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
for(vector<Diagnostic>::const_iterator j=i->diagnostics.begin(); j!=i->diagnostics.end(); ++j)
- append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(j->source), j->line, j->message));
+ if(j->source!=INTERNAL_SOURCE)
+ append(combined, "\n", format("%s:%d: %s", module->source_map.get_name(j->source), j->line, j->message));
return combined;
}
{
module->source_map.merge_from(mod.source_map);
- vector<Import *> imports = NodeGatherer<Import>().apply(mod.shared);
+ vector<Import *> imports;
+ for(NodeList<Statement>::const_iterator i=mod.shared.content.body.begin(); i!=mod.shared.content.body.end(); ++i)
+ if(Import *imp = dynamic_cast<Import *>(i->get()))
+ imports.push_back(imp);
for(vector<Import *>::iterator i=imports.begin(); i!=imports.end(); ++i)
import(res, (*i)->module);
NodeRemover().apply(mod.shared, set<Node *>(imports.begin(), imports.end()));
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)
inject_block(stage.content, builtins->content);
// Initial resolving pass
- BlockHierarchyResolver().apply(stage);
- TypeResolver().apply(stage);
- FunctionResolver().apply(stage);
- VariableResolver().apply(stage);
+ resolve(stage);
/* All variables local to a stage have been resolved. Resolve non-local
variables through interfaces. */
InterfaceGenerator().apply(stage);
- TypeResolver().apply(stage);
- VariableResolver().apply(stage);
+ resolve(stage, RESOLVE_BLOCKS|RESOLVE_TYPES|RESOLVE_VARIABLES);
- FunctionResolver().apply(stage);
ConstantSpecializer().apply(stage, (mode==PROGRAM && specialized ? &spec_values : 0));
if(mode==PROGRAM)
+ {
LegacyConverter().apply(stage, features);
+ resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS);
+ }
+}
+
+template<typename T>
+bool Compiler::resolve(Stage &stage, unsigned &flags, unsigned bit)
+{
+ if(!(flags&bit))
+ return false;
+
+ flags &= ~bit;
+ return T().apply(stage);
+}
+
+void Compiler::resolve(Stage &stage, unsigned flags)
+{
+ while(flags)
+ {
+ if(resolve<BlockHierarchyResolver>(stage, flags, RESOLVE_BLOCKS))
+ ;
+ else if(resolve<TypeResolver>(stage, flags, RESOLVE_TYPES))
+ flags |= RESOLVE_BLOCKS|RESOLVE_VARIABLES|RESOLVE_EXPRESSIONS;
+ else if(resolve<VariableResolver>(stage, flags, RESOLVE_VARIABLES))
+ flags |= RESOLVE_EXPRESSIONS;
+ else if(resolve<FunctionResolver>(stage, flags, RESOLVE_FUNCTIONS))
+ flags |= RESOLVE_EXPRESSIONS;
+ else if(resolve<ExpressionResolver>(stage, flags, RESOLVE_EXPRESSIONS))
+ flags |= RESOLVE_VARIABLES|RESOLVE_FUNCTIONS;
+ }
}
bool Compiler::validate(Stage &stage)
{
+ TypeValidator().apply(stage);
DeclarationValidator().apply(stage);
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 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 = FunctionInliner().apply(stage);
- any_inlined |= ExpressionInliner().apply(stage);
- if(any_inlined)
+ bool any_inlined = false;
+ if(FunctionInliner().apply(stage))
+ {
+ resolve(stage, RESOLVE_TYPES|RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
+ any_inlined = true;
+ }
+ if(ExpressionInliner().apply(stage))
{
- TypeResolver().apply(stage);
- VariableResolver().apply(stage);
- FunctionResolver().apply(stage);
+ resolve(stage, RESOLVE_VARIABLES|RESOLVE_FUNCTIONS|RESOLVE_EXPRESSIONS);
+ any_inlined = true;
}
/* Removing variables or functions may cause things from the previous stage