Refactor program stage management

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

diff --git a/source/core/program.h b/source/core/program.h
index 939521dcd804866a65f52d544b6aa722e773c798..090d8ed5ebc5c4d191ab24d13f7cef402502cdc3 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -74,6 +74,7 @@ public:
                unsigned matrix_stride;
                DataType type;
                Tag tag;
+               int binding;
 
                UniformInfo();
        };
@@ -100,16 +101,25 @@ public:
        };
 
 private:
-       struct Bindings
+       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;
-       Bindings *bindings;
+       TransientData *transient;
        bool linked;
        std::vector<UniformBlockInfo> uniform_blocks;
        std::vector<UniformInfo> uniforms;
@@ -136,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> &);
@@ -162,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_tag_compare(const UniformInfo &, const UniformInfo &);
-       template<typename T, typename A, A T::*>
-       static bool search(const T &, const A &);
 public:
        bool is_linked() const { return linked; }
        DEPRECATED std::string get_info_log() const;
@@ -177,6 +185,7 @@ public:
        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;