Better way to deal with program-owned shaders

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

diff --git a/source/program.h b/source/program.h
index 80ddf15ca33e282ff71a17cd79695db4fd324972..ac8e24b54b6a8143510ac743d6676e963e3b78ae 100644 (file)
--- a/source/program.h
+++ b/source/program.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_PROGRAM_H_
 #define MSP_GL_PROGRAM_H_
 
@@ -50,6 +43,7 @@ public:
                bool specular;
                bool normalmap;
                bool shadow;
+               bool transform;
 
                StandardFeatures();
 
@@ -67,7 +61,7 @@ public:
 private:
        unsigned id;
        std::list<Shader *> shaders;
-       bool del_shaders;
+       std::list<Shader *> owned_data;
        bool linked;
        std::map<std::string, UniformInfo> uniforms;
 
@@ -81,13 +75,13 @@ public:
        virtual ~Program();
 
        void attach_shader(Shader &shader);
+       void attach_shader_owned(Shader *shader);
        void detach_shader(Shader &shader);
        void add_standard_shaders(const StandardFeatures &);
 private:
        static std::string process_standard_source(const char **, const std::string &);
 public:
        const std::list<Shader *> &get_shaders() const { return shaders; }
-       void set_del_shaders(bool);
        void bind_attribute(unsigned, const std::string &);
        void link();
        bool is_linked() const { return linked; }