X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.h;h=7f6ad54e3a6c9a14c3cfb4224d1d0d83ce07c69a;hb=e98188ff6c9bba9761b71f2a69f3be7eb89ba3da;hp=dab249f47684546f42cc64b2c0436f538c434126;hpb=190a7e11237351f6b730c28f7b16f183e8adc69c;p=libs%2Fgl.git

diff --git a/source/core/program.h b/source/core/program.h
index dab249f4..7f6ad54e 100644
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -61,14 +61,17 @@ public:
 
 	void add_stages(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
 private:
-	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 &);
+	static std::vector<std::uint8_t> collect_used_variables(const SpirVModule &, const std::map<std::string, int> &);
+	static void collect_visited_blocks(const std::vector<SpirVModule::InstructionBlock> &, unsigned, std::vector<std::uint8_t> &);
+	void collect_uniforms(const SpirVModule &, const std::vector<std::uint8_t> &);
+	void collect_block_uniforms(const SpirVModule::Structure &, const std::string &, unsigned, std::vector<std::string> &);
+	void collect_attributes(const SpirVModule &, const std::vector<std::uint8_t> &);
 	void collect_builtins(const SpirVModule &);
 	void collect_builtins(const SpirVModule::Structure &);
 
 public:
 	ReflectData::LayoutHash get_uniform_layout_hash() const { return reflect_data.layout_hash; }
+	unsigned get_n_descriptor_sets() const { return reflect_data.n_descriptor_sets; }
 	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;
 	const std::vector<ReflectData::UniformInfo> &get_uniforms() const { return reflect_data.uniforms; }