Adapt to changes in mspmath

[libs/gl.git] / source / core / program.h

diff --git a/source/core/program.h b/source/core/program.h
index dab249f47684546f42cc64b2c0436f538c434126..e8487e09d001bfc34acb4f0caab85f21784faf60 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -51,6 +51,7 @@ private:
        };
 
        ReflectData reflect_data;
+       SpirVModule *specialized_spirv = 0;
 
 public:
        /// Constructs an empty Program with no shader stages attached.
@@ -59,16 +60,20 @@ public:
        /// Constructs a Program from a Module, with specialization constants.
        Program(const Module &, const std::map<std::string, int> & = std::map<std::string, int>());
 
+       Program(Program &&);
+       ~Program();
+
        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_uniforms(const SpirVModule &);
+       void collect_block_uniforms(const SpirVModule::Structure &, const std::string &, unsigned, std::vector<std::string> &);
        void collect_attributes(const SpirVModule &);
        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; }
@@ -77,6 +82,11 @@ public:
        int get_uniform_location(const std::string &) const;
        int get_uniform_location(Tag) const;
        int get_uniform_binding(Tag) const;
+       bool uses_uniform_block_binding(int b) const { return uses_binding(b|ReflectData::UNIFORM_BLOCK_BINDING); }
+       bool uses_texture_binding(unsigned b) const { return uses_binding(b|ReflectData::TEXTURE_BINDING); }
+private:
+       bool uses_binding(int) const;
+public:
        const std::vector<ReflectData::AttributeInfo> &get_attributes() const { return reflect_data.attributes; }
        const ReflectData::AttributeInfo &get_attribute_info(const std::string &) const;
        int get_attribute_location(const std::string &) const;