Refactor the interface of SL::Compiler

[libs/gl.git] / source / glsl / compiler.cpp

diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp
index 21060cb4b783975f72da2a039de2f6a07b86888f..0579bb017267c08dfab0af9f177a8077e048244d 100644 (file)
--- a/source/glsl/compiler.cpp
+++ b/source/glsl/compiler.cpp
@@ -9,6 +9,7 @@
 #include "generate.h"
 #include "optimize.h"
 #include "output.h"
+#include "resources.h"
 #include "shader.h"
 
 #undef interface
@@ -20,7 +21,6 @@ namespace GL {
 namespace SL {
 
 Compiler::Compiler():
-       resources(0),
        module(0)
 { }
 
@@ -29,31 +29,47 @@ Compiler::~Compiler()
        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();
+}
+
+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)
@@ -124,11 +140,11 @@ void Compiler::add_shaders(Program &program)
        }
 }
 
-void Compiler::append_module(Module &mod)
+void Compiler::append_module(Module &mod, DataFile::Collection *res)
 {
        vector<Import *> imports = NodeGatherer<Import>().apply(mod.shared);
        for(vector<Import *>::iterator i=imports.begin(); i!=imports.end(); ++i)
-               import((*i)->module);
+               import(res, (*i)->module);
        NodeRemover(set<Node *>(imports.begin(), imports.end())).apply(mod.shared);
 
        append_stage(mod.shared);
@@ -165,22 +181,7 @@ void Compiler::append_stage(Stage &stage)
        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())
@@ -191,7 +192,7 @@ void Compiler::import(const string &name)
        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, imported_names.size()), resources);
 }
 
 void Compiler::generate(Stage &stage)