Improvements to Bufferable

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

diff --git a/source/uniformblock.cpp b/source/uniformblock.cpp
index a87a6a42386ed39ee04b7368524796decd64ecfe..6b9de26931995e46446ef52e4dd57c81a3381ca0 100644 (file)
--- a/source/uniformblock.cpp
+++ b/source/uniformblock.cpp
@@ -41,7 +41,7 @@ void UniformBlock::offset_changed()
 void UniformBlock::upload_data() const
 {
        if(!buf_range)
-               buf_range = new BufferRange(*buffer, buffer_offset, size);
+               buf_range = new BufferRange(*get_buffer(), get_offset(), size);
        buf_range->data(&data[0]);
 }
 
@@ -53,7 +53,7 @@ void UniformBlock::attach(int index, const Uniform &uni)
 void UniformBlock::attach(const Program::UniformInfo &info, const Uniform &uni)
 {
        uniforms[info.location] = &uni;
-       if(buffer)
+       if(get_buffer())
        {
                uni.store(info, &data[info.location]);
                dirty = true;
@@ -62,13 +62,13 @@ void UniformBlock::attach(const Program::UniformInfo &info, const Uniform &uni)
 
 void UniformBlock::apply(int index) const
 {
-       if((index>=0) != (buffer!=0))
+       if((index>=0) != (get_buffer()!=0))
                throw invalid_operation("UniformBlock::apply");
 
-       if(buffer)
+       if(get_buffer())
        {
                if(dirty)
-                       update_buffer_data();
+                       update_buffer();
                buf_range->bind_to(UNIFORM_BUFFER, index);
        }
        else