Bufferable::Bufferable():
buffer(0),
- buffer_offset(0),
+ offset(0),
next_in_buffer(0),
prev_in_buffer(0),
dirty(false)
{
prev_in_buffer = prev;
if(prev_in_buffer)
+ {
+ next_in_buffer = prev_in_buffer->next_in_buffer;
prev_in_buffer->next_in_buffer = this;
+ }
}
- update_buffer_offset();
+ update_offset();
}
void Bufferable::unlink_from_buffer()
if(next_in_buffer)
{
next_in_buffer->prev_in_buffer = prev_in_buffer;
- next_in_buffer->update_buffer_offset();
+ next_in_buffer->update_offset();
}
prev_in_buffer = 0;
next_in_buffer = 0;
+ buffer = 0;
}
-void Bufferable::update_buffer_offset()
+void Bufferable::update_offset()
{
- unsigned offset = 0;
+ unsigned new_offset = 0;
if(prev_in_buffer)
- offset = prev_in_buffer->buffer_offset+prev_in_buffer->get_data_size();
+ new_offset = prev_in_buffer->offset+prev_in_buffer->get_data_size();
- if(offset!=buffer_offset)
+ unsigned align = get_alignment();
+ new_offset += align-1;
+ new_offset -= new_offset%align;
+ if(new_offset!=offset)
{
- buffer_offset = offset;
+ offset = new_offset;
dirty = true;
offset_changed();
}
if(next_in_buffer)
- next_in_buffer->update_buffer_offset();
+ next_in_buffer->update_offset();
- /* Do not resize the buffer here, as the offsets may change multiple times
- before the buffer is actually used */
+ /* Do not resize the buffer here, as more bufferables may be added before
+ the buffer is actually used. */
}
-void Bufferable::update_buffer_data() const
+void Bufferable::update_buffer() const
{
- const Bufferable *first = this;
- for(; first->prev_in_buffer; first=first->prev_in_buffer) ;
-
- unsigned total_size = 0;
- for(const Bufferable *b=first; b; b=b->next_in_buffer)
- total_size += b->get_data_size();
-
- if(total_size!=buffer->get_size())
+ if(offset+get_data_size()>=buffer->get_size())
{
- buffer->data(total_size, 0);
- // Resizing the buffer invalidates its contents.
- for(const Bufferable *b=first; b; b=b->next_in_buffer)
- b->dirty = true;
+ const Bufferable *last = this;
+ for(; last->next_in_buffer; last=last->next_in_buffer) ;
+
+ unsigned total_size = last->offset+last->get_data_size();
+
+ if(total_size>buffer->get_size())
+ {
+ buffer->data(total_size, 0);
+ /* Resizing the buffer invalidates its contents. Non-dirty data may
+ be in use, so reupload it. */
+ for(const Bufferable *b=last; b; b=b->prev_in_buffer)
+ if(!b->dirty)
+ b->upload_data();
+ }
}
upload_data();