X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Funiformblock.cpp;fp=source%2Funiformblock.cpp;h=6ea0d320c5b50d1f9e5cf352a0dd78871465b879;hb=f6e51c2f771726eec73b07824ebde2cf8bd522f0;hp=350f57ab6d0f48acaad3bca42f961ac8bf634aee;hpb=73fd6d13b8e68b2aeec8e5c85227cf361fdb467e;p=libs%2Fgl.git diff --git a/source/uniformblock.cpp b/source/uniformblock.cpp index 350f57ab..6ea0d320 100644 --- a/source/uniformblock.cpp +++ b/source/uniformblock.cpp @@ -22,6 +22,24 @@ UniformBlock::UniformBlock(unsigned s): buf_range(0) { } +UniformBlock::~UniformBlock() +{ + delete buf_range; +} + +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 +63,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