X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.h;h=666cfd3eeda8f6a00449b9ab4d899ff64aa0af78;hb=e72f81ac7f8708daab71965cfc9949ea64fd8a94;hp=939521dcd804866a65f52d544b6aa722e773c798;hpb=fa2b4c8a93ebad2497cacfdeaa9a2c20be486520;p=libs%2Fgl.git

diff --git a/source/core/program.h b/source/core/program.h
index 939521dc..666cfd3e 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -74,6 +74,7 @@ public:
 		unsigned matrix_stride;
 		DataType type;
 		Tag tag;
+		int binding;
 
 		UniformInfo();
 	};
@@ -162,9 +163,6 @@ private:
 	void update_layout_hash();
 	static LayoutHash compute_layout_hash(const std::vector<const UniformInfo *> &);
 	static bool uniform_location_compare(const UniformInfo *, const UniformInfo *);
-	static bool uniform_tag_compare(const UniformInfo &, const UniformInfo &);
-	template<typename T, typename A, A T::*>
-	static bool search(const T &, const A &);
 public:
 	bool is_linked() const { return linked; }
 	DEPRECATED std::string get_info_log() const;
@@ -177,6 +175,7 @@ public:
 	const UniformInfo &get_uniform_info(Tag) const;
 	int get_uniform_location(const std::string &) const;
 	int get_uniform_location(Tag) const;
+	int get_uniform_binding(Tag) const;
 	const std::vector<AttributeInfo> &get_attributes() const { return attributes; }
 	const AttributeInfo &get_attribute_info(const std::string &) const;
 	int get_attribute_location(const std::string &) const;