Construct uniform buffers for named uniform blocks

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

diff --git a/source/uniform.h b/source/uniform.h
index 216d3be6a65c37cf5b2694a004363bf98a306a18..f8a59f2a441e5fd2b3ec2ba55cdd604b50ab0477 100644 (file)
--- a/source/uniform.h
+++ b/source/uniform.h
@@ -2,6 +2,7 @@
 #define MSP_GL_UNIFORM_H_
 
 #include <algorithm>
+#include "program.h"
 
 namespace Msp {
 namespace GL {
@@ -17,6 +18,7 @@ public:
        virtual ~Uniform() { }
 
        virtual void apply(int) const = 0;
+       virtual void store(const Program::UniformInfo &, void *) const = 0;
        virtual Uniform *clone() const = 0;
 };
 
@@ -39,6 +41,12 @@ public:
 
        static void apply(int, unsigned, const T *);
 
+       virtual void store(const Program::UniformInfo &info, void *buffer) const
+       { store(info, buffer, &value); }
+
+       static void store(const Program::UniformInfo &, void *buffer, const T *value)
+       { *reinterpret_cast<T *>(buffer) = *value; }
+
        virtual UniformScalar *clone() const
        { return new UniformScalar(value); }
 };
@@ -66,6 +74,12 @@ public:
 
        static void apply(int index, unsigned size, const T *value);
 
+       virtual void store(const Program::UniformInfo &info, void *buffer) const
+       { store(info, buffer, value); }
+
+       static void store(const Program::UniformInfo &, void *buffer, const T *value)
+       { std::copy(value, value+vecsize, reinterpret_cast<T *>(buffer)); }
+
        virtual UniformVector *clone() const
        { return new UniformVector(value); }
 };
@@ -94,6 +108,15 @@ public:
 
        static void apply(int index, unsigned size, const T *value);
 
+       virtual void store(const Program::UniformInfo &info, void *buffer) const
+       { store(info, buffer, value); }
+
+       static void store(const Program::UniformInfo &info, void *buffer, const T *value)
+       {
+               for(unsigned i=0; i<cols; ++i)
+                       UniformVector<T, rows>::store(info, reinterpret_cast<char *>(buffer)+i*info.matrix_stride, value+i*rows);
+       }
+
        virtual UniformMatrix *clone() const
        { return new UniformMatrix(value); }
 };
@@ -106,6 +129,7 @@ class UniformArray: public Uniform
 {
 private:
        typedef typename T::BaseType BaseType;
+       enum { elemsize = sizeof(typename T::Type)/sizeof(typename T::BaseType) };
 
        BaseType *values;
        unsigned size;
@@ -114,7 +138,6 @@ public:
        UniformArray(unsigned n, const BaseType *vp):
                size(n)
        {
-               unsigned elemsize = sizeof(typename T::Type)/sizeof(typename T::BaseType);
                values = new BaseType[elemsize*size];
                std::copy(vp, vp+elemsize*size, values);
        }
@@ -122,6 +145,12 @@ public:
        virtual void apply(int index) const
        { T::apply(index, size, values); }
 
+       virtual void store(const Program::UniformInfo &info, void *buffer) const
+       {
+               for(unsigned i=0; i<size; ++i)
+                       T::store(info, reinterpret_cast<char *>(buffer)+i*info.array_stride, values+i*elemsize);
+       }
+
        virtual UniformArray *clone() const
        { return new UniformArray(size, values); }
 };