Fix reflection of image types from Spir-V modules

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

diff --git a/source/core/program.h b/source/core/program.h
index fd1c1ae09d10e12943ca13140339b96d59cd5ecf..9a4eb27a2dcb94f7fbfadf0102a290e9460002a1 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -13,8 +13,10 @@ namespace Msp {
 namespace GL {
 
 /**
-A complete shader program.  Programs can be assembled of individual Shaders or
-generated with a set of standard features.
+A shader program consisting of one or more stages.
+
+Programs are created from Modules.  Specialization values can be applied to
+customize behaviour of the module.
 */
 class Program: public ProgramBackend
 {
@@ -59,12 +61,15 @@ 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_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; }
@@ -76,6 +81,7 @@ 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;
+       unsigned get_n_clip_distances() const { return reflect_data.n_clip_distances; }
 
        using ProgramBackend::set_debug_name;
 };