X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogram.h;h=642bcf5e7755652734069e33d9df182a0e2fad96;hb=2579be0c3bf50f060364b937e6b2446ea3547e4b;hp=1e41e84423f8680ba787a83d8ecea5c45d1bc7c7;hpb=8ac93980ef87834fd431c97104baa441561a7ce0;p=libs%2Fgl.git

diff --git a/source/program.h b/source/program.h
index 1e41e844..642bcf5e 100644
--- a/source/program.h
+++ b/source/program.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_PROGRAM_H_
 #define MSP_GL_PROGRAM_H_
 
@@ -13,6 +6,7 @@ Distributed under the LGPL
 #include <msp/datafile/objectloader.h>
 #include "bindable.h"
 #include "gl.h"
+#include "programbuilder.h"
 
 namespace Msp {
 namespace GL {
@@ -36,35 +30,45 @@ public:
 		void vertex_shader(const std::string &);
 	};
 
-	struct StandardFeatures
+	struct UniformBlockInfo;
+
+	struct UniformInfo
 	{
-		class Loader: public DataFile::ObjectLoader<StandardFeatures>
-		{
-		public:
-			Loader(StandardFeatures &);
-		};
-
-		bool texture;
-		bool material;
-		bool lighting;
-		bool specular;
-		bool normalmap;
-		bool shadow;
-
-		StandardFeatures();
-
-		std::string create_flags() const;
+		std::string name;
+		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;
-	std::list<Shader *> shaders;
-	bool del_shaders;
+	ShaderList shaders;
+	ShaderList owned_data;
 	bool linked;
+	UniformBlockMap uniform_blocks;
+	UniformMap uniforms;
+	unsigned uniform_layout_hash;
+	bool legacy_vars;
 
 public:
 	Program();
-	Program(const StandardFeatures &);
+	Program(const ProgramBuilder::StandardFeatures &);
 	Program(const std::string &, const std::string &);
 private:
 	void init();
@@ -72,21 +76,31 @@ public:
 	virtual ~Program();
 
 	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 std::list<Shader *> &get_shaders() const { return shaders; }
-	void set_del_shaders(bool);
+	const ShaderList &get_shaders() const { return shaders; }
+
 	void bind_attribute(unsigned, const std::string &);
+	void bind_fragment_data(unsigned, const std::string &);
+
 	void link();
-	int get_param(GLenum param) const;
-	bool get_linked() const { return linked; }
+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;
 
+	bool uses_legacy_variables() const { return legacy_vars; }
+
+	void bind() const;
 	static void unbind();
 };