X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.h;h=b384defe90fa0d7904133a37bd3f66429c1f88fa;hb=8366f8951984aa436938b1bb18a57067ff2260c1;hp=b7f46ee4082a74a17ff68aa24328b6c5c01cf9f5;hpb=1b23728908f5ec9beb08b2b70737c3903745fddc;p=libs%2Fgl.git

diff --git a/source/core/program.h b/source/core/program.h
index b7f46ee4..b384defe 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -27,8 +27,6 @@ public:
 		Loader(Program &, Collection &);
 
 	private:
-		virtual void finish();
-
 		void module(const std::string &);
 	};
 
@@ -65,12 +63,22 @@ private:
 		std::map<unsigned, int> spec_values;
 	};
 
+	struct UniformCall
+	{
+		using FuncPtr = void (*)(unsigned, unsigned, const void *);
+
+		unsigned location;
+		unsigned size;
+		FuncPtr func;
+
+		UniformCall(unsigned l, unsigned s, FuncPtr f): location(l), size(s), func(f) { }
+	};
+
 	unsigned id;
 	unsigned stage_ids[MAX_STAGES];
-	const Module *module;
-	TransientData *transient;
 	bool linked;
 	ReflectData reflect_data;
+	std::vector<UniformCall> uniform_calls;
 	std::string debug_name;
 
 public:
@@ -89,23 +97,19 @@ public:
 private:
 	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> &);
+	void add_glsl_stages(const GlslModule &, const std::map<std::string, int> &, TransientData &);
+	void compile_glsl_stage(const GlslModule &, unsigned);
+	void add_spirv_stages(const SpirVModule &, const std::map<std::string, int> &, TransientData &);
 
-public:
-	void link();
-private:
+	void finalize(const Module &, const TransientData &);
 	void query_uniforms();
 	void query_uniform_blocks(const std::vector<ReflectData::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 collect_uniforms(const SpirVModule &, const std::map<unsigned, int> &);
+	void collect_block_uniforms(const SpirVModule::Structure &, const std::string &, unsigned, const std::map<unsigned, int> &, std::vector<std::string> &);
+	void collect_attributes(const SpirVModule &);
 
 public:
-	bool is_linked() const { return linked; }
-
 	ReflectData::LayoutHash get_uniform_layout_hash() const { return reflect_data.layout_hash; }
 	const std::vector<ReflectData::UniformBlockInfo> &get_uniform_blocks() const { return reflect_data.uniform_blocks; }
 	const ReflectData::UniformBlockInfo &get_uniform_block_info(const std::string &) const;