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

diff --git a/source/core/program.h b/source/core/program.h
index 3af4e582..090d8ed5 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -8,6 +8,7 @@
 #include "datatype.h"
 #include "gl.h"
 #include "module.h"
+#include "tag.h"
 #include "vertexformat.h"
 
 namespace Msp {
@@ -72,6 +73,8 @@ public:
 		unsigned array_stride;
 		unsigned matrix_stride;
 		DataType type;
+		Tag tag;
+		int binding;
 
 		UniformInfo();
 	};
@@ -98,9 +101,25 @@ public:
 	};
 
 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;
 	std::vector<UniformBlockInfo> uniform_blocks;
 	std::vector<UniformInfo> uniforms;
@@ -127,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> &);
@@ -153,9 +173,6 @@ private:
 	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;
@@ -165,7 +182,10 @@ public:
 	const UniformBlockInfo &get_uniform_block_info(const std::string &) const;
 	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;
+	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;