Add overloads of keyframe uniform statements without size suffixes

[libs/gl.git] / source / uniformblock.cpp

diff --git a/source/uniformblock.cpp b/source/uniformblock.cpp
index 2b9a135c0d8b61d9dd545c4aefeccd603f39fbf7..be30ce5b101420364b5bcba45722f00842e16099 100644 (file)
--- a/source/uniformblock.cpp
+++ b/source/uniformblock.cpp
@@ -1,4 +1,6 @@
 #include <stdexcept>
+#include <msp/gl/extensions/arb_shader_objects.h>
+#include <msp/gl/extensions/arb_uniform_buffer_object.h>
 #include "buffer.h"
 #include "color.h"
 #include "error.h"
@@ -12,42 +14,82 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-UniformBlock::UniformBlock()
-{ }
+UniformBlock::UniformBlock():
+       size(0),
+       buf_range(0)
+{
+       static Require _req(ARB_shader_objects);
+}
 
 UniformBlock::UniformBlock(unsigned s):
        size(s),
-       data(size)
-{ }
+       buf_range(0)
+{
+       static Require _req(ARB_uniform_buffer_object);
+
+       if(!size)
+               throw invalid_argument("UniformBlock::UniformBlock");
+       data.resize(size);
+}
+
+UniformBlock::~UniformBlock()
+{
+       delete buf_range;
+}
+
+unsigned UniformBlock::get_alignment() const
+{
+       return BufferRange::get_uniform_buffer_alignment();
+}
+
+void UniformBlock::offset_changed()
+{
+       delete buf_range;
+       buf_range = 0;
+}
+
+void UniformBlock::upload_data(char *target) const
+{
+       if(!buf_range)
+               buf_range = new BufferRange(*get_buffer(), get_offset(), size);
+
+       if(target)
+               copy(data.begin(), data.end(), target);
+       else
+               buf_range->data(&data[0]);
+}
 
 void UniformBlock::attach(int index, const Uniform &uni)
 {
+       if(size)
+               throw invalid_operation("UniformBlock::attach");
+
        uniforms[index] = &uni;
 }
 
 void UniformBlock::attach(const Program::UniformInfo &info, const Uniform &uni)
 {
-       uniforms[info.location] = &uni;
-       if(buffer)
+       if(size)
        {
                uni.store(info, &data[info.location]);
                dirty = true;
        }
+       else
+               uniforms[info.location] = &uni;
 }
 
 void UniformBlock::apply(int index) const
 {
-       if((index>=0) != (buffer!=0))
+       if((index>=0) != (size>0))
                throw invalid_operation("UniformBlock::apply");
 
-       if(buffer)
+       if(size)
        {
+               if(!get_buffer())
+                       throw invalid_operation("UniformBlock::apply");
+
                if(dirty)
-               {
-                       update_buffer_data();
-                       if(!buf_range)
-                               buf_range = new BufferRange(*buffer, buffer_offset, size);
-               }
+                       update_buffer();
                buf_range->bind_to(UNIFORM_BUFFER, index);
        }
        else