Refactor program stage management

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

diff --git a/source/core/program.h b/source/core/program.h
index 5ed61eaafb647654ba2f91ec8860340073f7645a..090d8ed5ebc5c4d191ab24d13f7cef402502cdc3 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -8,6 +8,7 @@
 #include "datatype.h"
 #include "gl.h"
 #include "module.h"
+#include "tag.h"
 #include "vertexformat.h"
 
 namespace Msp {
@@ -63,11 +64,17 @@ public:
        {
                std::string name;
                const UniformBlockInfo *block;
-               unsigned location;
+               union
+               {
+                       int location;
+                       unsigned offset;
+               };
                unsigned array_size;
                unsigned array_stride;
                unsigned matrix_stride;
                DataType type;
+               Tag tag;
+               int binding;
 
                UniformInfo();
        };
@@ -93,19 +100,31 @@ public:
                AttributeInfo();
        };
 
-       typedef std::map<std::string, UniformInfo> UniformMap;
-       typedef std::map<std::string, UniformBlockInfo> UniformBlockMap;
-       typedef std::map<std::string, AttributeInfo> AttributeMap;
-
 private:
+       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;
+       TransientData *transient;
        bool linked;
-       UniformBlockMap uniform_blocks;
-       UniformMap uniforms;
+       std::vector<UniformBlockInfo> uniform_blocks;
+       std::vector<UniformInfo> uniforms;
        LayoutHash uniform_layout_hash;
-       AttributeMap attributes;
+       std::vector<AttributeInfo> attributes;
 
 public:
        /// Constructs an empty Program with no shader stages attached.
@@ -127,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> &);
@@ -148,7 +168,7 @@ private:
        void query_uniform_blocks(const std::vector<UniformInfo *> &);
        void query_attributes();
        void collect_uniforms();
-       void collect_block_uniforms(UniformBlockInfo &, const SpirVModule::Structure &, const std::string &, unsigned);
+       void collect_block_uniforms(const SpirVModule::Structure &, const std::string &, unsigned, std::vector<std::string> &);
        void collect_attributes();
        void update_layout_hash();
        static LayoutHash compute_layout_hash(const std::vector<const UniformInfo *> &);
@@ -158,12 +178,15 @@ public:
        DEPRECATED std::string get_info_log() const;
 
        LayoutHash get_uniform_layout_hash() const { return uniform_layout_hash; }
-       const UniformBlockMap &get_uniform_blocks() const { return uniform_blocks; }
+       const std::vector<UniformBlockInfo> &get_uniform_blocks() const { return uniform_blocks; }
        const UniformBlockInfo &get_uniform_block_info(const std::string &) const;
-       const UniformMap &get_uniforms() const { return uniforms; }
+       const std::vector<UniformInfo> &get_uniforms() const { return uniforms; }
        const UniformInfo &get_uniform_info(const std::string &) const;
+       const UniformInfo &get_uniform_info(Tag) const;
        int get_uniform_location(const std::string &) const;
-       const AttributeMap &get_attributes() const { return attributes; }
+       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;