X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.h;h=21b38c255e7262d77d01800c2204d27c75c7f0f8;hb=ab83db6f1e31d44ced585119a57fd10896e469cb;hp=ac8e24b54b6a8143510ac743d6676e963e3b78ae;hpb=0646b330ffa9ea7fd77e2078257499b1d58ac0f7;p=libs%2Fgl.git

diff --git a/source/program.h b/source/program.h
index ac8e24b5..21b38c25 100644
--- a/source/program.h
+++ b/source/program.h
@@ -43,6 +43,7 @@ public:
 		bool specular;
 		bool normalmap;
 		bool shadow;
+		bool reflection;
 		bool transform;
 
 		StandardFeatures();
@@ -50,20 +51,40 @@ public:
 		std::string create_flags() const;
 	};
 
+	struct UniformBlockInfo;
+
 	struct UniformInfo
 	{
 		std::string name;
-		int location;
-		int size;
+		const UniformBlockInfo *block;
+		unsigned location;
+		unsigned size;
+		unsigned array_stride;
+		unsigned matrix_stride;
 		GLenum type;
 	};
 
+	struct UniformBlockInfo
+	{
+		std::string name;
+		unsigned data_size;
+		unsigned bind_point;
+		std::vector<const UniformInfo *> uniforms;
+		unsigned layout_hash;
+	};
+
+	typedef std::list<Shader *> ShaderList;
+	typedef std::map<std::string, UniformInfo> UniformMap;
+	typedef std::map<std::string, UniformBlockInfo> UniformBlockMap;
+
 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;
+	UniformBlockMap uniform_blocks;
+	UniformMap uniforms;
+	unsigned uniform_layout_hash;
 
 public:
 	Program();
@@ -81,14 +102,26 @@ 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();
+private:
+	static unsigned compute_layout_hash(const std::vector<const UniformInfo *> &);
+	static bool uniform_location_compare(const UniformInfo *, const UniformInfo *);
+public:
 	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; }
+	const UniformBlockMap &get_uniform_blocks() const { return uniform_blocks; }
+	const UniformBlockInfo &get_uniform_block_info(const std::string &) const;
+	const UniformMap &get_uniforms() const { return uniforms; }
+	const UniformInfo &get_uniform_info(const std::string &) const;
 	int get_uniform_location(const std::string &) const;
 
+	void bind() const;
 	static void unbind();
 };