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;
}
}