Construct uniform buffers for named uniform blocks

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

diff --git a/source/programdata.h b/source/programdata.h
index d74017b50ba237965f4aea15e9a8f295ca7e29f7..885804f010e16d868e7ab551caccb1b144824395 100644 (file)
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -7,6 +7,7 @@
 namespace Msp {
 namespace GL {
 
+class Buffer;
 class Color;
 class Matrix;
 class Program;
@@ -45,8 +46,11 @@ 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 UniformBlock *last_block;
+       mutable Buffer *buffer;
        mutable bool modified;
 
        ProgramData &operator=(const ProgramData &);
@@ -77,7 +81,7 @@ 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;
+       const UniformBlock &get_block(const Program &, const std::string &) const;
 
        void apply() const;
 };