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

diff --git a/source/program.h b/source/program.h
index b6007073..7e9676d3 100644
--- a/source/program.h
+++ b/source/program.h
@@ -59,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;
-	std::list<Shader *> owned_data;
+	ShaderList shaders;
+	ShaderList owned_data;
 	bool linked;
-	std::map<std::string, UniformInfo> uniforms;
+	UniformMap uniforms;
+	unsigned uniform_layout_hash;
 
 public:
 	Program();
@@ -82,14 +86,18 @@ public:
 private:
 	static std::string process_standard_source(const char **, const std::string &);
 public:
-	const std::list<Shader *> &get_shaders() const { return shaders; }
+	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();
 };