X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.h;h=f2d7d07672643edb8c83dd4a214bd45a7594be4b;hb=e92de029768eef5f0fd744329e589161b46d0762;hp=6f84cfd26436e314b6d48d02dac8e7c0e2b51154;hpb=7af200475facc657a0bbffaa17520d3ec9d809af;p=libs%2Fgl.git

diff --git a/source/core/program.h b/source/core/program.h
index 6f84cfd2..f2d7d076 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -4,10 +4,10 @@
 #include <string>
 #include <vector>
 #include <msp/datafile/objectloader.h>
-#include "bindable.h"
 #include "datatype.h"
 #include "gl.h"
 #include "module.h"
+#include "tag.h"
 #include "vertexformat.h"
 
 namespace Msp {
@@ -19,7 +19,7 @@ class Shader;
 A complete shader program.  Programs can be assembled of individual Shaders or
 generated with a set of standard features.
 */
-class Program: public Bindable<Program>
+class Program
 {
 public:
 	class Loader: public DataFile::CollectionObjectLoader<Program>
@@ -63,11 +63,19 @@ public:
 	{
 		std::string name;
 		const UniformBlockInfo *block;
-		unsigned location;
+		union
+		{
+			int location;
+			unsigned offset;
+		};
 		unsigned array_size;
 		unsigned array_stride;
 		unsigned matrix_stride;
 		DataType type;
+		Tag tag;
+		int binding;
+
+		UniformInfo();
 	};
 
 	struct UniformBlockInfo
@@ -77,6 +85,8 @@ public:
 		int bind_point;
 		std::vector<const UniformInfo *> uniforms;
 		LayoutHash layout_hash;
+
+		UniformBlockInfo();
 	};
 
 	struct AttributeInfo
@@ -85,21 +95,36 @@ public:
 		unsigned location;
 		unsigned array_size;
 		DataType type;
-	};
 
-	typedef std::map<std::string, UniformInfo> UniformMap;
-	typedef std::map<std::string, UniformBlockInfo> UniformBlockMap;
-	typedef std::map<std::string, AttributeInfo> AttributeMap;
+		AttributeInfo();
+	};
 
 private:
+	enum Stage
+	{
+		VERTEX,
+		GEOMETRY,
+		FRAGMENT,
+		MAX_STAGES
+	};
+
+	struct TransientData
+	{
+		std::map<std::string, unsigned> textures;
+		std::map<std::string, unsigned> blocks;
+		std::map<unsigned, int> spec_values;
+	};
+
 	unsigned id;
-	std::vector<unsigned> stage_ids;
+	unsigned stage_ids[MAX_STAGES];
 	const Module *module;
+	TransientData *transient;
 	bool linked;
-	UniformBlockMap uniform_blocks;
-	UniformMap uniforms;
+	std::vector<UniformBlockInfo> uniform_blocks;
+	std::vector<UniformInfo> uniforms;
 	LayoutHash uniform_layout_hash;
-	AttributeMap attributes;
+	std::vector<AttributeInfo> attributes;
+	std::string debug_name;
 
 public:
 	/// Constructs an empty Program with no shader stages attached.
@@ -121,7 +146,8 @@ public:
 
 	void add_stages(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
 private:
-	unsigned add_stage(GLenum);
+	bool has_stages() const;
+	unsigned add_stage(Stage);
 	void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &);
 	void compile_glsl_stage(unsigned);
 	void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &);
@@ -142,7 +168,7 @@ private:
 	void query_uniform_blocks(const std::vector<UniformInfo *> &);
 	void query_attributes();
 	void collect_uniforms();
-	void collect_block_uniforms(UniformBlockInfo &, const SpirVModule::Structure &, const std::string &, unsigned);
+	void collect_block_uniforms(const SpirVModule::Structure &, const std::string &, unsigned, std::vector<std::string> &);
 	void collect_attributes();
 	void update_layout_hash();
 	static LayoutHash compute_layout_hash(const std::vector<const UniformInfo *> &);
@@ -152,17 +178,23 @@ public:
 	DEPRECATED std::string get_info_log() const;
 
 	LayoutHash get_uniform_layout_hash() const { return uniform_layout_hash; }
-	const UniformBlockMap &get_uniform_blocks() const { return uniform_blocks; }
+	const std::vector<UniformBlockInfo> &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 std::vector<UniformInfo> &get_uniforms() const { return uniforms; }
 	const UniformInfo &get_uniform_info(const std::string &) const;
+	const UniformInfo &get_uniform_info(Tag) const;
 	int get_uniform_location(const std::string &) const;
-	const AttributeMap &get_attributes() const { return attributes; }
+	int get_uniform_location(Tag) const;
+	int get_uniform_binding(Tag) const;
+	const std::vector<AttributeInfo> &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();
+	unsigned get_id() const { return id; }
+
+	void set_debug_name(const std::string &);
+private:
+	void set_stage_debug_name(unsigned, Stage);
 };
 
 } // namespace GL