X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.h;h=6613a13451a8493224e4fe77f26dc6f17fcdcb46;hb=0375be1a27f8852ed8ca422db78bf6380d2b11b1;hp=f318c60639012ea66f9da3c43139003cae519202;hpb=ea7832c7c1ffab00cc1168bc8c41375fdd0eae86;p=libs%2Fgl.git

diff --git a/source/core/program.h b/source/core/program.h
index f318c606..6613a134 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -5,13 +5,14 @@
 #include <vector>
 #include <msp/datafile/objectloader.h>
 #include "bindable.h"
+#include "datatype.h"
 #include "gl.h"
+#include "module.h"
 #include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
-class Module;
 class Shader;
 
 /**
@@ -62,11 +63,17 @@ public:
 	{
 		std::string name;
 		const UniformBlockInfo *block;
-		unsigned location;
-		unsigned size;
+		union
+		{
+			int location;
+			unsigned offset;
+		};
+		unsigned array_size;
 		unsigned array_stride;
 		unsigned matrix_stride;
-		GLenum type;
+		DataType type;
+
+		UniformInfo();
 	};
 
 	struct UniformBlockInfo
@@ -76,29 +83,36 @@ public:
 		int bind_point;
 		std::vector<const UniformInfo *> uniforms;
 		LayoutHash layout_hash;
+
+		UniformBlockInfo();
 	};
 
 	struct AttributeInfo
 	{
 		std::string name;
 		unsigned location;
-		unsigned size;
-		GLenum type;
-	};
+		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:
+	struct Bindings
+	{
+		std::map<std::string, unsigned> textures;
+		std::map<std::string, unsigned> blocks;
+	};
+
 	unsigned id;
-	std::vector<unsigned> shader_ids;
+	std::vector<unsigned> stage_ids;
 	const Module *module;
+	Bindings *bindings;
 	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;
 
 public:
 	/// Constructs an empty Program with no shader stages attached.
@@ -119,7 +133,13 @@ public:
 	virtual ~Program();
 
 	void add_stages(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
+private:
+	unsigned add_stage(GLenum);
+	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> &);
 
+public:
 	DEPRECATED void attach_shader(Shader &shader);
 	DEPRECATED void attach_shader_owned(Shader *shader);
 	DEPRECATED void detach_shader(Shader &shader);
@@ -131,23 +151,29 @@ public:
 
 	void link();
 private:
-	static void require_type(GLenum);
 	void query_uniforms();
 	void query_uniform_blocks(const std::vector<UniformInfo *> &);
 	void query_attributes();
+	void collect_uniforms();
+	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 *> &);
 	static bool uniform_location_compare(const UniformInfo *, const UniformInfo *);
+	static bool uniform_name_compare(const UniformInfo &, const UniformInfo &);
+	template<typename T>
+	static bool name_search(const T &, const std::string &);
 public:
 	bool is_linked() const { return linked; }
 	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;
 	int get_uniform_location(const std::string &) const;
-	const AttributeMap &get_attributes() const { return attributes; }
+	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;