#include <msp/core/algorithm.h>
#include <msp/gl/extensions/ext_gpu_shader4.h>
#include <msp/strings/format.h>
-#include <msp/strings/regex.h>
-#include <msp/strings/utils.h>
#include "compatibility.h"
#include "compiler.h"
#include "error.h"
#include "generate.h"
#include "optimize.h"
#include "output.h"
+#include "resources.h"
#include "shader.h"
#undef interface
namespace SL {
Compiler::Compiler():
- resources(0),
module(0)
{ }
delete module;
}
-void Compiler::compile(const string &source, const string &src_name)
+void Compiler::clear()
{
- resources = 0;
delete module;
module = new Module();
+ imported_names.clear();
+ module->source_map.set_name(0, "<generated>");
+}
+
+void Compiler::set_source(const string &source, const string &src_name)
+{
+ clear();
Parser parser;
imported_names.push_back(src_name);
- append_module(parser.parse(source, src_name, 1));
- process();
+ append_module(parser.parse(source, src_name, 1), 0);
}
-void Compiler::compile(IO::Base &io, Resources *res, const string &src_name)
+void Compiler::load_source(IO::Base &io, DataFile::Collection *res, const string &src_name)
{
- resources = res;
- delete module;
- module = new Module();
+ clear();
Parser parser;
imported_names.push_back(src_name);
- append_module(parser.parse(io, src_name, 1));
- process();
+ append_module(parser.parse(io, src_name, 1), res);
}
-void Compiler::compile(IO::Base &io, const string &src_name)
+void Compiler::load_source(IO::Base &io, const string &src_name)
{
- compile(io, 0, src_name);
+ load_source(io, 0, src_name);
+}
+
+void Compiler::compile()
+{
+ for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+ generate(*i);
+ for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); )
+ {
+ if(optimize(*i))
+ i = module->stages.begin();
+ else
+ ++i;
+ }
+ for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
+ finalize(*i);
}
void Compiler::add_shaders(Program &program)
{
for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
{
- if(i->type==VERTEX)
+ string stage_src = Formatter().apply(*i);
+
+ if(i->type==Stage::VERTEX)
{
- program.attach_shader_owned(new VertexShader(apply<Formatter>(*i)));
+ program.attach_shader_owned(new VertexShader(stage_src));
for(map<string, unsigned>::iterator j=i->locations.begin(); j!=i->locations.end(); ++j)
program.bind_attribute(j->second, j->first);
}
- else if(i->type==GEOMETRY)
- program.attach_shader_owned(new GeometryShader(apply<Formatter>(*i)));
- else if(i->type==FRAGMENT)
+ else if(i->type==Stage::GEOMETRY)
+ program.attach_shader_owned(new GeometryShader(stage_src));
+ else if(i->type==Stage::FRAGMENT)
{
- program.attach_shader_owned(new FragmentShader(apply<Formatter>(*i)));
+ program.attach_shader_owned(new FragmentShader(stage_src));
if(EXT_gpu_shader4)
{
for(map<string, unsigned>::iterator j=i->locations.begin(); j!=i->locations.end(); ++j)
}
catch(const compile_error &e)
{
- static const Regex r_message("^(([0-9]+)\\(([0-9]+)\\) :|ERROR: ([0-9]+):([0-9]+):) (.*)$");
- vector<string> lines = split(e.what(), '\n');
- string translated;
- for(vector<string>::const_iterator i=lines.begin(); i!=lines.end(); ++i)
- {
- RegMatch m = r_message.match(*i);
- if(m)
- {
- unsigned index = 0;
- unsigned line = 0;
- if(m[2])
- {
- index = lexical_cast<unsigned>(m[2].str);
- line = lexical_cast<unsigned>(m[3].str);
- }
- else if(m[4])
- {
- index = lexical_cast<unsigned>(m[4].str);
- line = lexical_cast<unsigned>(m[5].str);
- }
- const char *src = "<unknown>";
- if(index==0)
- src = "<generated>";
- else if(index-1<imported_names.size())
- src = imported_names[index-1].c_str();
- translated += format("%s:%d: %s", src, line, m[6].str);
- }
- else
- translated += *i;
- translated += '\n';
- }
-
- throw compile_error(translated);
+ throw compile_error(module->source_map.translate_errors(e.what()));
}
}
-void Compiler::append_module(Module &mod)
+void Compiler::append_module(Module &mod, DataFile::Collection *res)
{
- vector<Import *> imports = apply<NodeGatherer<Import> >(mod.shared);
+ module->source_map.merge_from(mod.source_map);
+
+ vector<Import *> imports = NodeGatherer<Import>().apply(mod.shared);
for(vector<Import *>::iterator i=imports.begin(); i!=imports.end(); ++i)
- import((*i)->module);
- apply<NodeRemover>(mod.shared, set<Node *>(imports.begin(), imports.end()));
+ import(res, (*i)->module);
+ NodeRemover().apply(mod.shared, set<Node *>(imports.begin(), imports.end()));
append_stage(mod.shared);
for(list<Stage>::iterator i=mod.stages.begin(); i!=mod.stages.end(); ++i)
void Compiler::append_stage(Stage &stage)
{
Stage *target = 0;
- if(stage.type==SHARED)
+ if(stage.type==Stage::SHARED)
target = &module->shared;
else
{
target->required_version = stage.required_version;
for(NodeList<Statement>::iterator i=stage.content.body.begin(); i!=stage.content.body.end(); ++i)
target->content.body.push_back(*i);
- apply<DeclarationCombiner>(*target);
+ DeclarationCombiner().apply(*target);
}
-void Compiler::process()
-{
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- generate(*i);
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); )
- {
- if(optimize(*i))
- i = module->stages.begin();
- else
- ++i;
- }
- for(list<Stage>::iterator i=module->stages.begin(); i!=module->stages.end(); ++i)
- finalize(*i);
-}
-
-void Compiler::import(const string &name)
+void Compiler::import(DataFile::Collection *resources, const string &name)
{
string fn = name+".glsl";
if(find(imported_names, fn)!=imported_names.end())
if(!io)
throw runtime_error(format("module %s not found", name));
Parser import_parser;
- append_module(import_parser.parse(*io, fn, imported_names.size()));
+ append_module(import_parser.parse(*io, fn, module->source_map.get_count()), resources);
}
void Compiler::generate(Stage &stage)
stage.required_version = module->shared.required_version;
inject_block(stage.content, module->shared.content);
- apply<DeclarationReorderer>(stage);
- apply<FunctionResolver>(stage);
- apply<VariableResolver>(stage);
- apply<InterfaceGenerator>(stage);
- apply<VariableResolver>(stage);
- apply<DeclarationReorderer>(stage);
- apply<FunctionResolver>(stage);
- apply<LegacyConverter>(stage);
+ DeclarationReorderer().apply(stage);
+ FunctionResolver().apply(stage);
+ VariableResolver().apply(stage);
+ InterfaceGenerator().apply(stage);
+ VariableResolver().apply(stage);
+ DeclarationReorderer().apply(stage);
+ FunctionResolver().apply(stage);
+ LegacyConverter().apply(stage);
}
bool Compiler::optimize(Stage &stage)
{
- apply<ConstantConditionEliminator>(stage);
+ ConstantConditionEliminator().apply(stage);
- set<FunctionDeclaration *> inlineable = apply<InlineableFunctionLocator>(stage);
- apply<FunctionInliner>(stage, inlineable);
+ FunctionInliner().apply(stage);
- set<Node *> unused = apply<UnusedVariableLocator>(stage);
- set<Node *> unused2 = apply<UnusedFunctionLocator>(stage);
- unused.insert(unused2.begin(), unused2.end());
- apply<NodeRemover>(stage, unused);
+ bool result = UnusedVariableRemover().apply(stage);
+ result |= UnusedFunctionRemover().apply(stage);
- return !unused.empty();
+ return result;
}
void Compiler::finalize(Stage &stage)
{
if(get_gl_api()==OPENGL_ES2)
- apply<DefaultPrecisionGenerator>(stage);
+ DefaultPrecisionGenerator().apply(stage);
else
- apply<PrecisionRemover>(stage);
+ PrecisionRemover().apply(stage);
}
void Compiler::inject_block(Block &target, const Block &source)
target.body.insert(insert_point, (*i)->clone());
}
-template<typename T>
-typename T::ResultType Compiler::apply(Stage &stage)
-{
- T visitor;
- visitor.apply(stage);
- return visitor.get_result();
-}
-
-template<typename T, typename A>
-typename T::ResultType Compiler::apply(Stage &stage, const A &arg)
-{
- T visitor(arg);
- visitor.apply(stage);
- return visitor.get_result();
-}
-
} // namespace SL
} // namespace GL
} // namespace Msp
projects / libs / gl.git / blobdiff