Restructure ProgramData to support sharing between Programs

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

diff --git a/source/programdata.h b/source/programdata.h
index 7d106305548b72e056d9a577101d959268f4b23e..6d0ebf8ad50c53d7526396c1a865a97935a812f2 100644 (file)
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -11,6 +11,7 @@ class Color;
 class Matrix;
 class Program;
 class Uniform;
+class UniformBlock;
 class Vector3;
 class Vector4;
 
@@ -33,32 +34,30 @@ public:
        };
 
 private:
-       const Program &program;
-       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;
+
+       UniformMap uniforms;
+       mutable BlockMap blocks;
+       mutable bool modified;
 
        ProgramData &operator=(const ProgramData &);
 public:
-       explicit ProgramData(const Program &);
+       ProgramData();
        ProgramData(const ProgramData &);
        ~ProgramData();
 
 private:
-       void uniform(int, Uniform *);
+       void uniform(const std::string &, Uniform *);
 public:
-       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 uniform(int, const Vector3 &);
-       void uniform3(int, const float *);
-       void uniform(int, float, float, float, float);
-       void uniform(int, const Vector4 &);
-       void uniform(int, const Color &);
-       void uniform4(int, const float *);
-       void uniform_matrix4(int, const float *);
-       void uniform_matrix4(int, const Matrix &);
-
        void uniform(const std::string &, int);
        void uniform(const std::string &, float);
        void uniform(const std::string &, float, float);
@@ -73,6 +72,8 @@ public:
        void uniform_matrix4(const std::string &, const float *);
        void uniform_matrix4(const std::string &, const Matrix &);
 
+       const UniformBlock &get_block(const Program &) const;
+
        void apply() const;
 };