X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Funiformblock.cpp;h=a87a6a42386ed39ee04b7368524796decd64ecfe;hb=18878df418035445ba5146fcde3d647d7aa8c054;hp=350f57ab6d0f48acaad3bca42f961ac8bf634aee;hpb=73fd6d13b8e68b2aeec8e5c85227cf361fdb467e;p=libs%2Fgl.git diff --git a/source/uniformblock.cpp b/source/uniformblock.cpp index 350f57ab..a87a6a42 100644 --- a/source/uniformblock.cpp +++ b/source/uniformblock.cpp @@ -22,6 +22,29 @@ UniformBlock::UniformBlock(unsigned s): buf_range(0) { } +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() const +{ + if(!buf_range) + buf_range = new BufferRange(*buffer, buffer_offset, size); + buf_range->data(&data[0]); +} + void UniformBlock::attach(int index, const Uniform &uni) { uniforms[index] = &uni; @@ -45,11 +68,7 @@ void UniformBlock::apply(int index) const if(buffer) { if(dirty) - { update_buffer_data(); - if(!buf_range) - buf_range = new BufferRange(*buffer, buffer_offset, size); - } buf_range->bind_to(UNIFORM_BUFFER, index); } else