X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.h;h=a1f454e9453272cf14b84a29ce60bc8c6a765b60;hb=f9c15dc04462b2f1eea1d6bdd71e3ba967b1bd8c;hp=80ddf15ca33e282ff71a17cd79695db4fd324972;hpb=541bf02f18ad27e8c8101e4255586ddbfef40916;p=libs%2Fgl.git

diff --git a/source/program.h b/source/program.h
index 80ddf15c..a1f454e9 100644
--- 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,8 @@ public:
 		bool specular;
 		bool normalmap;
 		bool shadow;
+		bool reflection;
+		bool transform;
 
 		StandardFeatures();
 
@@ -67,9 +62,10 @@ public:
 private:
 	unsigned id;
 	std::list<Shader *> shaders;
-	bool del_shaders;
+	std::list<Shader *> owned_data;
 	bool linked;
 	std::map<std::string, UniformInfo> uniforms;
+	unsigned uniform_layout_hash;
 
 public:
 	Program();
@@ -81,18 +77,19 @@ 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; }
 	std::string get_info_log() const;
 	void bind() const;
+	unsigned get_uniform_layout_hash() const { return uniform_layout_hash; }
 	int get_uniform_location(const std::string &) const;
 
 	static void unbind();