Avoid creating blocks for which there are no uniforms

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

diff --git a/source/programdata.h b/source/programdata.h
index 4d80bb775afc92f20c05714c998399909a2299a7..cf642e6141222d3033d80bc6d92e50ff6c99e863 100644 (file)
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -35,10 +35,18 @@ public:
        };
 
 private:
+       enum Changes
+       {
+               NO_CHANGES,
+               VALUES_CHANGED,
+               KEYS_CHANGED
+       };
+
        struct Block
        {
-               bool dirty;
+               Changes changes;
                UniformBlock *block;
+               std::map<unsigned, const Uniform *const *> uniforms;
 
                Block();
        };
@@ -51,7 +59,7 @@ private:
        mutable BlockMap blocks;
        mutable UniformBlock *last_block;
        mutable Buffer *buffer;
-       mutable bool modified;
+       mutable Changes changes;
 
        ProgramData &operator=(const ProgramData &);
 public:
@@ -82,9 +90,11 @@ public:
        void uniform_matrix4_array(const std::string &, unsigned, const float *);
 
 private:
-       const UniformBlock &get_block(const Program &, const Program::UniformBlockInfo *) const;
+       void find_uniforms_for_block(Block &, const Program::UniformBlockInfo &) const;
+       UniformBlock *create_block(const Program::UniformBlockInfo &) const;
+       const UniformBlock *get_block(const Program &, const Program::UniformBlockInfo *) const;
 public:
-       const UniformBlock &get_block(const Program &, const std::string &) const;
+       const UniformBlock *get_block(const Program &, const std::string &) const;
 
        void apply() const;
 };