Refactor setting uniform values in ProgramData

This eliminates copies when changing values of existing uniforms.

diff --git a/source/programdata.cpp b/source/programdata.cpp
index 4d8ca4dd1adabc338967ab91bc2e817091d18a49..5005373b752dc469b0871c5537f3f40c707417c1 100644 (file)
--- a/source/programdata.cpp
+++ b/source/programdata.cpp
@@ -89,30 +89,86 @@ void ProgramData::uniform(const string &name, Uniform *uni)
 {
        try
        {
-               if(tied_program)
-                       tied_program->get_uniform_info(name);
-               else if(name[name.size()-1]==']')
-                       throw invalid_argument("ProgramData::uniform");
+               if(!validate_name(name))
+               {
+                       delete uni;
+                       return;
+               }
        }
-       catch(const exception &e)
+       catch(...)
        {
                delete uni;
-#ifdef DEBUG
-               IO::print(IO::cerr, "Error while setting uniform %s: %s: %s\n", name, Debug::demangle(typeid(e).name()), e.what());
-               return;
-#else
                throw;
-#endif
        }
 
        int i = find_uniform_index(name);
-       if(i>=0)
-       {
-               uniforms[i].replace_value(uni);
-               dirty |= 1<<i;
+       if(i<0)
+               return add_uniform(name, uni);
+
+       uniforms[i].replace_value(uni);
+       dirty |= 1<<i;
+}
+
+template<typename T, typename V>
+void ProgramData::uniform(const string &name, V value)
+{
+       if(!validate_name(name))
                return;
+
+       int i = find_uniform_index(name);
+       if(i<0)
+               return add_uniform(name, new T(value));
+
+       if(T *uni = dynamic_cast<T *>(uniforms[i].value))
+               uni->set(value);
+       else
+               uniforms[i].replace_value(new T(value));
+
+       dirty |= 1<<i;
+}
+
+template<typename T, typename V>
+void ProgramData::uniform_array(const string &name, unsigned n, V value)
+{
+       if(!validate_name(name))
+               return;
+
+       int i = find_uniform_index(name);
+       if(i<0)
+               return add_uniform(name, new UniformArray<T>(n, value));
+
+       UniformArray<T> *uni = dynamic_cast<UniformArray<T> *>(uniforms[i].value);
+       if(uni && n==uni->size())
+               uni->set(value);
+       else
+               uniforms[i].replace_value(new UniformArray<T>(n, value));
+
+       dirty |= 1<<i;
+}
+
+bool ProgramData::validate_name(const string &name) const
+{
+#ifdef DEBUG
+       try
+#endif
+       {
+               if(tied_program)
+                       tied_program->get_uniform_info(name);
+               else if(name[name.size()-1]==']')
+                       throw invalid_argument("ProgramData::uniform");
+               return true;
        }
+#ifdef DEBUG
+       catch(const exception &e)
+       {
+               IO::print(IO::cerr, "Error while setting uniform %s: %s: %s\n", name, Debug::demangle(typeid(e).name()), e.what());
+               return false;
+       }
+#endif
+}
 
+void ProgramData::add_uniform(const string &name, Uniform *uni)
+{
        if(uniforms.size()>=MASK_BITS)
        {
                delete uni;
@@ -136,12 +192,12 @@ void ProgramData::uniform(const string &name, const Uniform &u)
 
 void ProgramData::uniform(const string &name, int v)
 {
-       uniform(name, new Uniform1i(v));
+       uniform<Uniform1i>(name, v);
 }
 
 void ProgramData::uniform(const string &name, float v)
 {
-       uniform(name, new Uniform1f(v));
+       uniform<Uniform1f>(name, v);
 }
 
 void ProgramData::uniform(const string &name, int v0, int v1)
@@ -158,12 +214,12 @@ void ProgramData::uniform(const string &name, float v0, float v1)
 
 void ProgramData::uniform2(const string &name, const int *v)
 {
-       uniform(name, new Uniform2i(v));
+       uniform<Uniform2i>(name, v);
 }
 
 void ProgramData::uniform2(const string &name, const float *v)
 {
-       uniform(name, new Uniform2f(v));
+       uniform<Uniform2f>(name, v);
 }
 
 void ProgramData::uniform(const string &name, int v0, int v1, int v2)
@@ -185,12 +241,12 @@ void ProgramData::uniform(const string &name, const Vector3 &v)
 
 void ProgramData::uniform3(const string &name, const int *v)
 {
-       uniform(name, new Uniform3i(v));
+       uniform<Uniform3i>(name, v);
 }
 
 void ProgramData::uniform3(const string &name, const float *v)
 {
-       uniform(name, new Uniform3f(v));
+       uniform<Uniform3f>(name, v);
 }
 
 void ProgramData::uniform(const string &name, int v0, int v1, int v2, int v3)
@@ -217,12 +273,12 @@ void ProgramData::uniform(const string &name, const Color &c)
 
 void ProgramData::uniform4(const string &name, const int *v)
 {
-       uniform(name, new Uniform4i(v));
+       uniform<Uniform4i>(name, v);
 }
 
 void ProgramData::uniform4(const string &name, const float *v)
 {
-       uniform(name, new Uniform4f(v));
+       uniform<Uniform4f>(name, v);
 }
 
 void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 2, 2> &m)
@@ -232,7 +288,7 @@ void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 2, 2> &
 
 void ProgramData::uniform_matrix2(const string &name, const float *v)
 {
-       uniform(name, new UniformMatrix2x2f(v));
+       uniform<UniformMatrix2x2f>(name, v);
 }
 
 void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 2, 3> &m)
@@ -242,7 +298,7 @@ void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 2, 3> &
 
 void ProgramData::uniform_matrix3x2(const string &name, const float *v)
 {
-       uniform(name, new UniformMatrix3x2f(v));
+       uniform<UniformMatrix3x2f>(name, v);
 }
 
 void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 2, 4> &m)
@@ -252,7 +308,7 @@ void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 2, 4> &
 
 void ProgramData::uniform_matrix4x2(const string &name, const float *v)
 {
-       uniform(name, new UniformMatrix4x2f(v));
+       uniform<UniformMatrix4x2f>(name, v);
 }
 
 void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 3, 2> &m)
@@ -262,7 +318,7 @@ void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 3, 2> &
 
 void ProgramData::uniform_matrix2x3(const string &name, const float *v)
 {
-       uniform(name, new UniformMatrix2x3f(v));
+       uniform<UniformMatrix2x3f>(name, v);
 }
 
 void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 3, 3> &m)
@@ -272,7 +328,7 @@ void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 3, 3> &
 
 void ProgramData::uniform_matrix3(const string &name, const float *v)
 {
-       uniform(name, new UniformMatrix3x3f(v));
+       uniform<UniformMatrix3x3f>(name, v);
 }
 
 void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 3, 4> &m)
@@ -282,7 +338,7 @@ void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 3, 4> &
 
 void ProgramData::uniform_matrix4x3(const string &name, const float *v)
 {
-       uniform(name, new UniformMatrix4x3f(v));
+       uniform<UniformMatrix4x3f>(name, v);
 }
 
 void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 4, 2> &m)
@@ -292,7 +348,7 @@ void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 4, 2> &
 
 void ProgramData::uniform_matrix2x4(const string &name, const float *v)
 {
-       uniform(name, new UniformMatrix2x4f(v));
+       uniform<UniformMatrix2x4f>(name, v);
 }
 
 void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 4, 3> &m)
@@ -302,7 +358,7 @@ void ProgramData::uniform(const string &name, const LinAl::Matrix<float, 4, 3> &
 
 void ProgramData::uniform_matrix3x4(const string &name, const float *v)
 {
-       uniform(name, new UniformMatrix3x4f(v));
+       uniform<UniformMatrix3x4f>(name, v);
 }
 
 void ProgramData::uniform(const string &name, const Matrix &m)
@@ -312,92 +368,92 @@ void ProgramData::uniform(const string &name, const Matrix &m)
 
 void ProgramData::uniform_matrix4(const string &name, const float *v)
 {
-       uniform(name, new UniformMatrix4x4f(v));
+       uniform<UniformMatrix4x4f>(name, v);
 }
 
 void ProgramData::uniform1_array(const string &name, unsigned n, const int *v)
 {
-       uniform(name, new UniformArray<Uniform1i>(n, v));
+       uniform_array<Uniform1i>(name, n, v);
 }
 
 void ProgramData::uniform1_array(const string &name, unsigned n, const float *v)
 {
-       uniform(name, new UniformArray<Uniform1f>(n, v));
+       uniform_array<Uniform1f>(name, n, v);
 }
 
 void ProgramData::uniform2_array(const string &name, unsigned n, const int *v)
 {
-       uniform(name, new UniformArray<Uniform2i>(n, v));
+       uniform_array<Uniform2i>(name, n, v);
 }
 
 void ProgramData::uniform2_array(const string &name, unsigned n, const float *v)
 {
-       uniform(name, new UniformArray<Uniform2f>(n, v));
+       uniform_array<Uniform2f>(name, n, v);
 }
 
 void ProgramData::uniform3_array(const string &name, unsigned n, const int *v)
 {
-       uniform(name, new UniformArray<Uniform3i>(n, v));
+       uniform_array<Uniform3i>(name, n, v);
 }
 
 void ProgramData::uniform3_array(const string &name, unsigned n, const float *v)
 {
-       uniform(name, new UniformArray<Uniform3f>(n, v));
+       uniform_array<Uniform3f>(name, n, v);
 }
 
 void ProgramData::uniform4_array(const string &name, unsigned n, const int *v)
 {
-       uniform(name, new UniformArray<Uniform4i>(n, v));
+       uniform_array<Uniform4i>(name, n, v);
 }
 
 void ProgramData::uniform4_array(const string &name, unsigned n, const float *v)
 {
-       uniform(name, new UniformArray<Uniform4f>(n, v));
+       uniform_array<Uniform4f>(name, n, v);
 }
 
 void ProgramData::uniform_matrix2_array(const string &name, unsigned n, const float *v)
 {
-       uniform(name, new UniformArray<UniformMatrix2x2f>(n, v));
+       uniform_array<UniformMatrix2x2f>(name, n, v);
 }
 
 void ProgramData::uniform_matrix3x2_array(const string &name, unsigned n, const float *v)
 {
-       uniform(name, new UniformArray<UniformMatrix3x2f>(n, v));
+       uniform_array<UniformMatrix3x2f>(name, n, v);
 }
 
 void ProgramData::uniform_matrix4x2_array(const string &name, unsigned n, const float *v)
 {
-       uniform(name, new UniformArray<UniformMatrix4x2f>(n, v));
+       uniform_array<UniformMatrix4x2f>(name, n, v);
 }
 
 void ProgramData::uniform_matrix2x3_array(const string &name, unsigned n, const float *v)
 {
-       uniform(name, new UniformArray<UniformMatrix2x3f>(n, v));
+       uniform_array<UniformMatrix2x3f>(name, n, v);
 }
 
 void ProgramData::uniform_matrix3_array(const string &name, unsigned n, const float *v)
 {
-       uniform(name, new UniformArray<UniformMatrix3x3f>(n, v));
+       uniform_array<UniformMatrix3x3f>(name, n, v);
 }
 
 void ProgramData::uniform_matrix4x3_array(const string &name, unsigned n, const float *v)
 {
-       uniform(name, new UniformArray<UniformMatrix4x3f>(n, v));
+       uniform_array<UniformMatrix4x3f>(name, n, v);
 }
 
 void ProgramData::uniform_matrix2x4_array(const string &name, unsigned n, const float *v)
 {
-       uniform(name, new UniformArray<UniformMatrix2x4f>(n, v));
+       uniform_array<UniformMatrix2x4f>(name, n, v);
 }
 
 void ProgramData::uniform_matrix3x4_array(const string &name, unsigned n, const float *v)
 {
-       uniform(name, new UniformArray<UniformMatrix3x4f>(n, v));
+       uniform_array<UniformMatrix3x4f>(name, n, v);
 }
 
 void ProgramData::uniform_matrix4_array(const string &name, unsigned n, const float *v)
 {
-       uniform(name, new UniformArray<UniformMatrix4x4f>(n, v));
+       uniform_array<UniformMatrix4x4f>(name, n, v);
 }
 
 void ProgramData::remove_uniform(const string &name)

diff --git a/source/programdata.h b/source/programdata.h
index d9eaf7469e337bf93f5ea64612b57e8f34d7fe54..e96a73acc651ba8ec9a1ab2b3af1cf77f337c4bc 100644 (file)
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -169,6 +169,12 @@ public:
 
 private:
        void uniform(const std::string &, Uniform *);
+       template<typename T, typename V>
+       void uniform(const std::string &, V);
+       template<typename T, typename V>
+       void uniform_array(const std::string &, unsigned, V);
+       bool validate_name(const std::string &) const;
+       void add_uniform(const std::string &, Uniform *);
 public:
        void uniform(const std::string &, const Uniform &);
        void uniform(const std::string &, int);

diff --git a/source/uniform.h b/source/uniform.h
index 5d288cf50e29485701bb125830aebe4504d0ae07..bc78bab8c1c891ad55086397f2bbcc9250d949a4 100644 (file)
--- a/source/uniform.h
+++ b/source/uniform.h
@@ -36,6 +36,8 @@ private:
 public:
        UniformScalar(Type v): value(v) { }
 
+       void set(Type v) { value = v; }
+
        Type get() const { return value; }
 
        virtual void apply(int index) const
@@ -68,7 +70,9 @@ private:
        Type value;
 
 public:
-       UniformVector(const T *vp)
+       UniformVector(const T *vp) { set(vp); }
+
+       void set(const T *vp)
        { std::copy(vp, vp+vecsize, value); }
 
        BaseType get(unsigned i) const { return value[i]; }
@@ -107,7 +111,9 @@ private:
        Type value;
 
 public:
-       UniformMatrix(const T *vp)
+       UniformMatrix(const T *vp) { set(vp); }
+
+       void set(const T *vp)
        { std::copy(vp, vp+rows*cols, value); }
 
        virtual void apply(int index) const
@@ -147,15 +153,15 @@ private:
        typedef typename T::BaseType BaseType;
        enum { elemsize = sizeof(typename T::Type)/sizeof(typename T::BaseType) };
 
+       unsigned size_;
        BaseType *values;
-       unsigned size;
 
 public:
        UniformArray(unsigned n, const BaseType *vp):
-               size(n)
+               size_(n),
+               values(new BaseType[elemsize*size_])
        {
-               values = new BaseType[elemsize*size];
-               std::copy(vp, vp+elemsize*size, values);
+               set(vp);
        }
 
        ~UniformArray()
@@ -163,17 +169,22 @@ public:
                delete[] values;
        }
 
+       unsigned size() const { return size_; }
+
+       void set(const BaseType *vp)
+       { std::copy(vp, vp+elemsize*size_, values); }
+
        virtual void apply(int index) const
-       { T::apply(index, size, values); }
+       { T::apply(index, size_, values); }
 
        virtual void store(const Program::UniformInfo &info, void *buffer) const
        {
-               for(unsigned i=0; i<size; ++i)
+               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); }
+       { return new UniformArray(size_, values); }
 };
 
 } // namespace GL