X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogram.h;h=8cdfb6de44e561910b0f4e446d0d0095bab76b89;hp=ddfc828c5ceddcbbc6e2758318ca78ec0e3512be;hb=9034e81679eeeaa3d1d5d643d3f924d9edb45a68;hpb=d02c2ebbdb48b65a45c10293e97be2aa747eb913

diff --git a/source/program.h b/source/program.h
index ddfc828c..8cdfb6de 100644
--- a/source/program.h
+++ b/source/program.h
@@ -6,6 +6,7 @@
 #include <msp/datafile/objectloader.h>
 #include "bindable.h"
 #include "gl.h"
+#include "programbuilder.h"
 
 namespace Msp {
 namespace GL {
@@ -29,50 +30,44 @@ public:
 		void vertex_shader(const std::string &);
 	};
 
-	struct StandardFeatures
-	{
-		class Loader: public DataFile::ObjectLoader<StandardFeatures>
-		{
-		public:
-			Loader(StandardFeatures &);
-		};
-
-		bool texture;
-		bool material;
-		bool lighting;
-		bool specular;
-		bool normalmap;
-		bool shadow;
-		bool reflection;
-		bool transform;
-
-		StandardFeatures();
-
-		std::string create_flags() const;
-	};
+	struct UniformBlockInfo;
 
 	struct UniformInfo
 	{
 		std::string name;
-		int location;
-		int size;
+		const UniformBlockInfo *block;
+		unsigned location;
+		unsigned size;
+		unsigned array_stride;
+		unsigned matrix_stride;
 		GLenum type;
 	};
 
+	struct UniformBlockInfo
+	{
+		std::string name;
+		unsigned data_size;
+		unsigned bind_point;
+		std::vector<const UniformInfo *> uniforms;
+		unsigned layout_hash;
+	};
+
 	typedef std::list<Shader *> ShaderList;
 	typedef std::map<std::string, UniformInfo> UniformMap;
+	typedef std::map<std::string, UniformBlockInfo> UniformBlockMap;
 
 private:
 	unsigned id;
 	ShaderList shaders;
 	ShaderList owned_data;
 	bool linked;
+	UniformBlockMap uniform_blocks;
 	UniformMap uniforms;
 	unsigned uniform_layout_hash;
 
 public:
 	Program();
-	Program(const StandardFeatures &);
+	Program(const ProgramBuilder::StandardFeatures &);
 	Program(const std::string &, const std::string &);
 private:
 	void init();
@@ -82,19 +77,26 @@ public:
 	void attach_shader(Shader &shader);
 	void attach_shader_owned(Shader *shader);
 	void detach_shader(Shader &shader);
-	void add_standard_shaders(const StandardFeatures &);
-private:
-	static std::string process_standard_source(const char **, const std::string &);
-public:
 	const ShaderList &get_shaders() const { return shaders; }
+
 	void bind_attribute(unsigned, const std::string &);
+
 	void link();
+private:
+	static unsigned 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;
-	void bind() const;
+
 	unsigned 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;
 
+	void bind() const;
 	static void unbind();
 };