Use Tag to identify uniforms in Program and ProgramData

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

diff --git a/source/core/program.h b/source/core/program.h
index 33413eb01da23eb035fa0fc04e1fc5c488d7c323..939521dcd804866a65f52d544b6aa722e773c798 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -7,13 +7,13 @@
 #include "bindable.h"
 #include "datatype.h"
 #include "gl.h"
+#include "module.h"
+#include "tag.h"
 #include "vertexformat.h"
 
 namespace Msp {
 namespace GL {
 
-class GlslModule;
-class Module;
 class Shader;
 
 /**
@@ -64,11 +64,18 @@ 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;
+
+               UniformInfo();
        };
 
        struct UniformBlockInfo
@@ -78,6 +85,8 @@ public:
                int bind_point;
                std::vector<const UniformInfo *> uniforms;
                LayoutHash layout_hash;
+
+               UniformBlockInfo();
        };
 
        struct AttributeInfo
@@ -86,21 +95,26 @@ public:
                unsigned location;
                unsigned array_size;
                DataType type;
-       };
 
-       typedef std::map<std::string, UniformInfo> UniformMap;
-       typedef std::map<std::string, UniformBlockInfo> UniformBlockMap;
-       typedef std::map<std::string, AttributeInfo> AttributeMap;
+               AttributeInfo();
+       };
 
 private:
+       struct Bindings
+       {
+               std::map<std::string, unsigned> textures;
+               std::map<std::string, unsigned> blocks;
+       };
+
        unsigned id;
        std::vector<unsigned> stage_ids;
        const Module *module;
+       Bindings *bindings;
        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.
@@ -125,6 +139,7 @@ private:
        unsigned add_stage(GLenum);
        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> &);
 
 public:
        DEPRECATED void attach_shader(Shader &shader);
@@ -141,19 +156,28 @@ private:
        void query_uniforms();
        void query_uniform_blocks(const std::vector<UniformInfo *> &);
        void query_attributes();
+       void collect_uniforms();
+       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 *> &);
        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;
 
        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;
+       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;