Redesign the way shader programs are loaded

[libs/gl.git] / source / resources / resources.cpp

diff --git a/source/resources/resources.cpp b/source/resources/resources.cpp
index dc034746652c0559a60972b8613e4d93956bb054..ef8b93255fca8927104d35e4434e4a68cf5ee1bf 100644 (file)
--- a/source/resources/resources.cpp
+++ b/source/resources/resources.cpp
@@ -8,6 +8,7 @@
 #include "lighting.h"
 #include "material.h"
 #include "mesh.h"
+#include "module.h"
 #include "object.h"
 #include "pipelinetemplate.h"
 #include "pose.h"
@@ -44,10 +45,11 @@ Resources::Resources():
        add_type<Lighting>().suffix(".lightn").keyword("lighting");
        add_type<Material>().suffix(".mat").creator(&Resources::create_material);
        add_type<Mesh>().keyword("mesh").creator(&Resources::create_mesh);
+       add_type<Module>().suffix(".glsl").creator(&Resources::create_module);
        add_type<Object>().keyword("object");
        add_type<PipelineTemplate>().suffix(".pipe").keyword("pipeline");
        add_type<Pose>().keyword("pose");
-       add_type<Program>().keyword("shader").suffix(".glsl").creator(&Resources::create_program);
+       add_type<Program>().keyword("shader").creator(&Resources::create_program);
        add_type<Sampler>().suffix(".samp").keyword("sampler");
        add_type<Technique>().suffix(".tech").keyword("technique");
        add_type<Texture1D>().base<Texture>().suffix(".tex1d").keyword("texture1d");
@@ -166,21 +168,30 @@ Texture2D *Resources::create_texture2d(const string &name)
        return 0;
 }
 
+Module *Resources::create_module(const string &name)
+{
+       if(RefPtr<IO::Seekable> io = open_raw(name))
+       {
+               RefPtr<Module> module = new Module;
+               module->load_source(*io, this, name);
+               return module.release();
+       }
+
+       return 0;
+}
+
 Program *Resources::create_program(const string &name)
 {
        string ext = FS::extpart(name);
-       if(ext==".shader")
-               return 0;
-
-       if(RefPtr<IO::Seekable> io = open_raw(name))
+       string base = FS::basepart(name);
+       string ext2 = FS::extpart(base);
+       if(ext==".shader" && ext2==".glsl")
        {
-               SL::Compiler compiler;
-               compiler.load_source(*io, this, name);
-               compiler.compile();
-               RefPtr<Program> program = new Program;
-               compiler.add_shaders(*program);
-               program->link();
-               return program.release();
+               Module &module = get<Module>(base);
+               RefPtr<Program> shprog = new Program;
+               shprog->add_stages(module);
+               shprog->link();
+               return shprog.release();
        }
 
        return 0;