X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogram.h;h=d2032a5cd46843e36def08c91f8a95d699025bd1;hp=e78c8ccd0bfef96d0da006827bd6e22dee527973;hb=ca52c492bd4f2fa1a1db3a85e50eaf7c43474830;hpb=a1eb8711ba225bb4423868c50369ad5592465171

diff --git a/source/program.h b/source/program.h
index e78c8ccd..d2032a5c 100644
--- a/source/program.h
+++ b/source/program.h
@@ -1,8 +1,8 @@
 #ifndef MSP_GL_PROGRAM_H_
 #define MSP_GL_PROGRAM_H_
 
-#include <list>
 #include <string>
+#include <vector>
 #include <msp/datafile/objectloader.h>
 #include "bindable.h"
 #include "gl.h"
@@ -31,10 +31,12 @@ public:
 
 		void attribute(unsigned, const std::string &);
 		void fragment_shader(const std::string &);
+		void geometry_shader(const std::string &);
 		void standard();
 		void vertex_shader(const std::string &);
 	};
 
+	typedef unsigned LayoutHash;
 	struct UniformBlockInfo;
 
 	struct UniformInfo
@@ -52,14 +54,23 @@ public:
 	{
 		std::string name;
 		unsigned data_size;
-		unsigned bind_point;
+		int bind_point;
 		std::vector<const UniformInfo *> uniforms;
-		unsigned layout_hash;
+		LayoutHash layout_hash;
 	};
 
-	typedef std::list<Shader *> ShaderList;
+	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;
@@ -68,7 +79,8 @@ private:
 	bool linked;
 	UniformBlockMap uniform_blocks;
 	UniformMap uniforms;
-	unsigned uniform_layout_hash;
+	LayoutHash uniform_layout_hash;
+	AttributeMap attributes;
 	bool legacy_vars;
 
 public:
@@ -78,6 +90,9 @@ public:
 	/// Constructs a Program with standard features.
 	Program(const ProgramBuilder::StandardFeatures &);
 
+	/// Constructs a Program from unified source code using ProgramCompiler.
+	Program(const std::string &);
+
 	/// Constructs a Program from vertex and fragment shader source code.
 	Program(const std::string &, const std::string &);
 
@@ -89,7 +104,7 @@ public:
 	void attach_shader(Shader &shader);
 	void attach_shader_owned(Shader *shader);
 	void detach_shader(Shader &shader);
-	const ShaderList &get_shaders() const { return shaders; }
+	const ShaderList &get_attached_shaders() const { return shaders; }
 
 	void bind_attribute(unsigned, const std::string &);
 	void bind_attribute(VertexComponent, const std::string &);
@@ -97,18 +112,24 @@ public:
 
 	void link();
 private:
-	static unsigned compute_layout_hash(const std::vector<const UniformInfo *> &);
+	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:
 	bool is_linked() const { return linked; }
 	std::string get_info_log() const;
 
-	unsigned get_uniform_layout_hash() const { return uniform_layout_hash; }
+	LayoutHash 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;
+	const AttributeMap &get_attributes() const { return attributes; }
+	const AttributeInfo &get_attribute_info(const std::string &) const;
+	int get_attribute_location(const std::string &) const;
 
 	bool uses_legacy_variables() const { return legacy_vars; }