X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbufferable.cpp;h=c312a4339a876f8436877842f44e689aa3f32b7a;hb=f73e671dcb36c097647cddbf5b1eaaad2ffc9299;hp=24c0f2789f4bae1bf256237587509ff40c408e68;hpb=5a3966187c59c8763b7109d252875939e70cc151;p=libs%2Fgl.git diff --git a/source/core/bufferable.cpp b/source/core/bufferable.cpp index 24c0f278..c312a433 100644 --- a/source/core/bufferable.cpp +++ b/source/core/bufferable.cpp @@ -53,18 +53,13 @@ void Bufferable::change_buffer(Buffer *buf) } } -unsigned Bufferable::get_required_buffer_size() const +size_t Bufferable::get_required_buffer_size() const { const Bufferable *last = this; for(; last->next_in_buffer; last=last->next_in_buffer) ; return last->offset+last->get_data_size(); } -Bufferable::AsyncUpdater *Bufferable::refresh_async() const -{ - return dirty ? new AsyncUpdater(*this) : 0; -} - void Bufferable::unlink_from_buffer() { if(prev_in_buffer) @@ -82,11 +77,11 @@ void Bufferable::unlink_from_buffer() void Bufferable::update_offset() { - unsigned new_offset = 0; + size_t new_offset = 0; if(prev_in_buffer) new_offset = prev_in_buffer->offset+prev_in_buffer->get_data_size(); - unsigned align = get_alignment(); + size_t align = get_alignment(); new_offset += align-1; new_offset -= new_offset%align; if(new_offset!=offset) @@ -110,11 +105,10 @@ void Bufferable::upload_data(char *target) const if(!buffer) throw invalid_operation("Bufferable::upload_data"); - unsigned data_size = get_data_size(); + size_t data_size = get_data_size(); if(location_dirty) { buffer->require_size(offset+data_size); - location_changed(buffer, offset, data_size); location_dirty = false; }