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

diff --git a/source/core/program.h b/source/core/program.h
index 6f84cfd2..3af4e582 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -63,11 +63,17 @@ 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;
+
+		UniformInfo();
 	};
 
 	struct UniformBlockInfo
@@ -77,6 +83,8 @@ public:
 		int bind_point;
 		std::vector<const UniformInfo *> uniforms;
 		LayoutHash layout_hash;
+
+		UniformBlockInfo();
 	};
 
 	struct AttributeInfo
@@ -85,21 +93,19 @@ 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:
 	unsigned id;
 	std::vector<unsigned> stage_ids;
 	const Module *module;
 	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.
@@ -142,22 +148,25 @@ 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 *> &);
 	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;