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

diff --git a/source/core/program.h b/source/core/program.h
index 6613a134..939521dc 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -8,6 +8,7 @@
 #include "datatype.h"
 #include "gl.h"
 #include "module.h"
+#include "tag.h"
 #include "vertexformat.h"
 
 namespace Msp {
@@ -72,6 +73,7 @@ public:
 		unsigned array_stride;
 		unsigned matrix_stride;
 		DataType type;
+		Tag tag;
 
 		UniformInfo();
 	};
@@ -160,9 +162,9 @@ 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_name_compare(const UniformInfo &, const UniformInfo &);
-	template<typename T>
-	static bool name_search(const T &, const std::string &);
+	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;
@@ -172,7 +174,9 @@ public:
 	const UniformBlockInfo &get_uniform_block_info(const std::string &) const;
 	const std::vector<UniformInfo> &get_uniforms() const { return uniforms; }
 	const UniformInfo &get_uniform_info(const std::string &) const;
+	const UniformInfo &get_uniform_info(Tag) const;
 	int get_uniform_location(const std::string &) const;
+	int get_uniform_location(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;