X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.h;h=8c1356c2678a7ec306ddfe60368d12dd5805caac;hb=d971f8d4848c0b3b453c626a2dafe19445e3e5a8;hp=cbb52cd4536e93bd0b2cd65c0f9868cfe946b1f5;hpb=573ea4e5602c4321cc1d75daf9ed0beed5cde280;p=libs%2Fgl.git

diff --git a/source/program.h b/source/program.h
index cbb52cd4..8c1356c2 100644
--- a/source/program.h
+++ b/source/program.h
@@ -59,9 +59,18 @@ public:
 		LayoutHash layout_hash;
 	};
 
+	struct AttributeInfo
+	{
+		std::string name;
+		unsigned location;
+		unsigned size;
+		GLenum type;
+	};
+
 	typedef std::vector<Shader *> ShaderList;
 	typedef std::map<std::string, UniformInfo> UniformMap;
 	typedef std::map<std::string, UniformBlockInfo> UniformBlockMap;
+	typedef std::map<std::string, AttributeInfo> AttributeMap;
 
 private:
 	unsigned id;
@@ -71,7 +80,7 @@ private:
 	UniformBlockMap uniform_blocks;
 	UniformMap uniforms;
 	LayoutHash uniform_layout_hash;
-	bool legacy_vars;
+	AttributeMap attributes;
 
 public:
 	/// Constructs an empty Program with no Shaders attached.
@@ -102,6 +111,10 @@ public:
 
 	void link();
 private:
+	static void require_type(GLenum);
+	void query_uniforms();
+	void query_uniform_blocks(const std::vector<UniformInfo *> &);
+	void query_attributes();
 	static LayoutHash compute_layout_hash(const std::vector<const UniformInfo *> &);
 	static bool uniform_location_compare(const UniformInfo *, const UniformInfo *);
 public:
@@ -114,8 +127,9 @@ public:
 	const UniformMap &get_uniforms() const { return uniforms; }
 	const UniformInfo &get_uniform_info(const std::string &) const;
 	int get_uniform_location(const std::string &) const;
-
-	bool uses_legacy_variables() const { return legacy_vars; }
+	const AttributeMap &get_attributes() const { return attributes; }
+	const AttributeInfo &get_attribute_info(const std::string &) const;
+	int get_attribute_location(const std::string &) const;
 
 	void bind() const;
 	static void unbind();