X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogram.h;h=fc60db46fcc2265af0b1ad9282eec1b5b19f6dcb;hp=4feb862d29483cf99359e52750d671726e1175ef;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=5ae4b0008b25072b5716f0cb585133315625a661

diff --git a/source/program.h b/source/program.h
index 4feb862d..fc60db46 100644
--- a/source/program.h
+++ b/source/program.h
@@ -1,12 +1,11 @@
 #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"
-#include "programbuilder.h"
 #include "vertexformat.h"
 
 namespace Msp {
@@ -31,7 +30,7 @@ public:
 
 		void attribute(unsigned, const std::string &);
 		void fragment_shader(const std::string &);
-		void standard();
+		void geometry_shader(const std::string &);
 		void vertex_shader(const std::string &);
 	};
 
@@ -58,9 +57,18 @@ public:
 		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;
@@ -70,14 +78,14 @@ private:
 	UniformBlockMap uniform_blocks;
 	UniformMap uniforms;
 	LayoutHash uniform_layout_hash;
-	bool legacy_vars;
+	AttributeMap attributes;
 
 public:
 	/// Constructs an empty Program with no Shaders attached.
 	Program();
 
-	/// 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 &);
@@ -90,7 +98,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 &);
@@ -98,6 +106,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:
@@ -110,8 +122,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();