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

diff --git a/source/program.h b/source/program.h
index 80ddf15c..7e9676d3 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();
 
@@ -64,12 +59,16 @@ public:
 		GLenum type;
 	};
 
+	typedef std::list<Shader *> ShaderList;
+	typedef std::map<std::string, UniformInfo> UniformMap;
+
 private:
 	unsigned id;
-	std::list<Shader *> shaders;
-	bool del_shaders;
+	ShaderList shaders;
+	ShaderList owned_data;
 	bool linked;
-	std::map<std::string, UniformInfo> uniforms;
+	UniformMap uniforms;
+	unsigned uniform_layout_hash;
 
 public:
 	Program();
@@ -81,20 +80,24 @@ 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);
+	const ShaderList &get_shaders() const { return shaders; }
+
 	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;
 
+	void bind() const;
 	static void unbind();
 };