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

diff --git a/source/program.h b/source/program.h
index 40a7a33b..21b38c25 100644
--- a/source/program.h
+++ b/source/program.h
@@ -51,9 +51,12 @@ public:
 		std::string create_flags() const;
 	};
 
+	struct UniformBlockInfo;
+
 	struct UniformInfo
 	{
 		std::string name;
+		const UniformBlockInfo *block;
 		unsigned location;
 		unsigned size;
 		unsigned array_stride;
@@ -106,6 +109,7 @@ public:
 	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;