Redesign the way shader programs are loaded

[libs/gl.git] / source / core / program.h

diff --git a/source/core/program.h b/source/core/program.h
index fc60db46fcc2265af0b1ad9282eec1b5b19f6dcb..e86ee0595f0ed307047681f74be256fbf06b3d70 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -11,6 +11,7 @@
 namespace Msp {
 namespace GL {
 
+class Module;
 class Shader;
 
 /**
@@ -20,10 +21,10 @@ generated with a set of standard features.
 class Program: public Bindable<Program>
 {
 public:
-       class Loader: public DataFile::ObjectLoader<Program>
+       class Loader: public DataFile::CollectionObjectLoader<Program>
        {
        public:
-               Loader(Program &);
+               Loader(Program &, Collection &);
 
        private:
                virtual void finish();
@@ -31,6 +32,7 @@ public:
                void attribute(unsigned, const std::string &);
                void fragment_shader(const std::string &);
                void geometry_shader(const std::string &);
+               void module(const std::string &);
                void vertex_shader(const std::string &);
        };
 
@@ -65,15 +67,14 @@ public:
                GLenum type;
        };
 
-       typedef std::vector<Shader *> ShaderList;
        typedef std::map<std::string, UniformInfo> UniformMap;
        typedef std::map<std::string, UniformBlockInfo> UniformBlockMap;
        typedef std::map<std::string, AttributeInfo> AttributeMap;
 
 private:
        unsigned id;
-       ShaderList shaders;
-       ShaderList owned_data;
+       std::vector<unsigned> shader_ids;
+       const Module *module;
        bool linked;
        UniformBlockMap uniform_blocks;
        UniformMap uniforms;
@@ -88,21 +89,23 @@ public:
        Program(const std::string &);
 
        /// Constructs a Program from vertex and fragment shader source code.
-       Program(const std::string &, const std::string &);
+       DEPRECATED Program(const std::string &, const std::string &);
 
 private:
        void init();
 public:
        virtual ~Program();
 
-       void attach_shader(Shader &shader);
-       void attach_shader_owned(Shader *shader);
-       void detach_shader(Shader &shader);
-       const ShaderList &get_attached_shaders() const { return shaders; }
+       void add_stages(const Module &);
 
-       void bind_attribute(unsigned, const std::string &);
-       void bind_attribute(VertexComponent, const std::string &);
-       void bind_fragment_data(unsigned, const std::string &);
+       DEPRECATED void attach_shader(Shader &shader);
+       DEPRECATED void attach_shader_owned(Shader *shader);
+       DEPRECATED void detach_shader(Shader &shader);
+       DEPRECATED const std::vector<Shader *> &get_attached_shaders() const;
+
+       DEPRECATED void bind_attribute(unsigned, const std::string &);
+       DEPRECATED void bind_attribute(VertexComponent, const std::string &);
+       DEPRECATED void bind_fragment_data(unsigned, const std::string &);
 
        void link();
 private:
@@ -114,7 +117,7 @@ private:
        static bool uniform_location_compare(const UniformInfo *, const UniformInfo *);
 public:
        bool is_linked() const { return linked; }
-       std::string get_info_log() const;
+       DEPRECATED std::string get_info_log() const;
 
        LayoutHash get_uniform_layout_hash() const { return uniform_layout_hash; }
        const UniformBlockMap &get_uniform_blocks() const { return uniform_blocks; }