X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.h;h=132c21d5b126ec7d1dc3d2d9bb94ec1814747fb0;hb=3f7b09b2e12830eb439889b300f0d6591c4952ac;hp=a1f454e9453272cf14b84a29ce60bc8c6a765b60;hpb=cc5e2fb2a0fbb48a9780c9a7c363d1712e459740;p=libs%2Fgl.git

diff --git a/source/program.h b/source/program.h
index a1f454e9..132c21d5 100644
--- a/source/program.h
+++ b/source/program.h
@@ -51,20 +51,39 @@ 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:
@@ -83,15 +102,25 @@ 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 *> &);
+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();
 };