Construct uniform buffers for named uniform blocks

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

diff --git a/source/programdata.h b/source/programdata.h
index 591ffee347f7dfe6bf97a3e1ef9b9772f87c101a..885804f010e16d868e7ab551caccb1b144824395 100644 (file)
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_PROGRAMDATA_H_
 #define MSP_GL_PROGRAMDATA_H_
 
@@ -14,8 +7,14 @@ Distributed under the LGPL
 namespace Msp {
 namespace GL {
 
+class Buffer;
+class Color;
+class Matrix;
 class Program;
 class Uniform;
+class UniformBlock;
+class Vector3;
+class Vector4;
 
 /**
 Stores uniform variables for a shader program.
@@ -25,11 +24,8 @@ class ProgramData
 public:
        class Loader: public DataFile::ObjectLoader<ProgramData>
        {
-       private:
-               Program &prog;
-
        public:
-               Loader(ProgramData &, Program &);
+               Loader(ProgramData &);
        private:
                void uniform1i(const std::string &, int);
                void uniform1f(const std::string &, float);
@@ -39,24 +35,54 @@ public:
        };
 
 private:
-       std::map<int, Uniform *> data;
+       struct Block
+       {
+               bool dirty;
+               UniformBlock *block;
+
+               Block();
+       };
+
+       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(const ProgramData &);
        ProgramData &operator=(const ProgramData &);
 public:
        ProgramData();
+       ProgramData(const ProgramData &);
        ~ProgramData();
 
-       void uniform(int, Uniform *);
-       void uniform(int, int);
-       void uniform(int, float);
-       void uniform(int, float, float);
-       void uniform2(int, const float *);
-       void uniform(int, float, float, float);
-       void uniform3(int, const float *);
-       void uniform(int, float, float, float, float);
-       void uniform4(int, const float *);
-       void uniform_matrix4(int, const float *);
+private:
+       void uniform(const std::string &, Uniform *);
+public:
+       void uniform(const std::string &, int);
+       void uniform(const std::string &, float);
+       void uniform(const std::string &, float, float);
+       void uniform2(const std::string &, const float *);
+       void uniform(const std::string &, float, float, float);
+       void uniform(const std::string &, const Vector3 &);
+       void uniform3(const std::string &, const float *);
+       void uniform(const std::string &, float, float, float, float);
+       void uniform(const std::string &, const Vector4 &);
+       void uniform(const std::string &, const Color &);
+       void uniform4(const std::string &, const float *);
+       void uniform_matrix4(const std::string &, const float *);
+       void uniform_matrix4(const std::string &, const Matrix &);
+       void uniform1_array(const std::string &, unsigned, const float *);
+       void uniform2_array(const std::string &, unsigned, const float *);
+       void uniform3_array(const std::string &, unsigned, const float *);
+       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 std::string &) const;
+
        void apply() const;
 };