Rewrite ProgramData update in a more efficient way

[libs/gl.git] / source / programdata.h

diff --git a/source/programdata.h b/source/programdata.h
index f11a254cb8014e5ec9a341f5c695c5685b7c802c..08b117b4fbc2712842bfd2967f23201a29b18bcc 100644 (file)
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -89,14 +89,36 @@ private:
                ALL_ONES = static_cast<Mask>(-1)
        };
 
+       struct NamedUniform
+       {
+               std::string name;
+               Uniform *value;
+
+               NamedUniform();
+
+               bool compare_name(const std::string &, unsigned) const;
+               void replace_value(Uniform *);
+       };
+
        struct SharedBlock
        {
                Mask used;
                Mask dirty;
                UniformBlock *block;
-
-               SharedBlock();
-               SharedBlock(unsigned, UniformBlock *);
+               union
+               {
+                       UInt8 type_flag;
+                       UInt8 values[16];
+                       struct
+                       {
+                               UInt8 type_flag;
+                               UInt8 *values;
+                       } dynamic;
+               } indices;
+
+               SharedBlock(UniformBlock *);
+
+               const UInt8 *get_uniform_indices() const;
        };
 
        struct ProgramBlock
@@ -118,14 +140,12 @@ private:
                ProgramUniforms();
        };
 
-       typedef std::map<std::string, unsigned> SlotMap;
        typedef std::map<Program::LayoutHash, SharedBlock> BlockMap;
        typedef std::map<Program::LayoutHash, ProgramUniforms> ProgramMap;
 
        // XXX All these mutables are a bit silly, but I'm out of better ideas
        const Program *tied_program;
-       SlotMap uniform_slots;
-       std::vector<Uniform *> uniforms;
+       std::vector<NamedUniform> uniforms;
        mutable BlockMap blocks;
        mutable ProgramMap programs;
        mutable UniformBlock *last_block;
@@ -182,8 +202,10 @@ public:
        const Uniform &get_uniform(const std::string &) const;
 
 private:
-       unsigned compute_slot_mask(const Program::UniformBlockInfo &) const;
-       void update_block(UniformBlock &, const Program::UniformBlockInfo &) const;
+       static bool uniform_name_compare(const NamedUniform &, const std::string &);
+       int find_uniform_index(const std::string &) const;
+       void update_block_uniform_indices(SharedBlock &, const Program::UniformBlockInfo &) const;
+       void update_block(SharedBlock &, const Program::UniformBlockInfo &) const;
        SharedBlock *get_shared_block(const Program::UniformBlockInfo &) const;
 
 public: