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 d74017b50ba237965f4aea15e9a8f295ca7e29f7..cf642e6141222d3033d80bc6d92e50ff6c99e863 100644 (file)
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -3,13 +3,14 @@
 
 #include <map>
 #include <msp/datafile/objectloader.h>
+#include "program.h"
 
 namespace Msp {
 namespace GL {
 
+class Buffer;
 class Color;
 class Matrix;
-class Program;
 class Uniform;
 class UniformBlock;
 class Vector3;
@@ -34,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();
        };
@@ -45,9 +54,12 @@ private:
        typedef std::map<std::string, Uniform *> UniformMap;
        typedef std::map<unsigned, Block> BlockMap;
 
+       // XXX All these mutables are a bit silly, but I'm out of better ideas
        UniformMap uniforms;
        mutable BlockMap blocks;
-       mutable bool modified;
+       mutable UniformBlock *last_block;
+       mutable Buffer *buffer;
+       mutable Changes changes;
 
        ProgramData &operator=(const ProgramData &);
 public:
@@ -77,7 +89,12 @@ public:
        void uniform4_array(const std::string &, unsigned, const float *);
        void uniform_matrix4_array(const std::string &, unsigned, const float *);
 
-       const UniformBlock &get_block(const Program &) const;
+private:
+       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;
 
        void apply() const;
 };