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

diff --git a/source/program.h b/source/program.h
index 1e41e844..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,17 +43,32 @@ public:
 		bool specular;
 		bool normalmap;
 		bool shadow;
+		bool reflection;
+		bool transform;
 
 		StandardFeatures();
 
 		std::string create_flags() const;
 	};
 
+	struct UniformInfo
+	{
+		std::string name;
+		int location;
+		int size;
+		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;
+	UniformMap uniforms;
+	unsigned uniform_layout_hash;
 
 public:
 	Program();
@@ -72,21 +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();
-	int get_param(GLenum param) const;
-	bool get_linked() const { return linked; }
+	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();
 };