prev_in_buffer->next_in_buffer = this;
}
- update_buffer_offsets();
+ update_buffer_offset();
}
void Bufferable::unlink_from_buffer()
if(next_in_buffer)
{
next_in_buffer->prev_in_buffer = prev_in_buffer;
- next_in_buffer->update_buffer_offsets();
+ next_in_buffer->update_buffer_offset();
}
prev_in_buffer = 0;
next_in_buffer = 0;
}
-void Bufferable::update_buffer_offsets()
+void Bufferable::update_buffer_offset()
{
unsigned offset = 0;
if(prev_in_buffer)
{
buffer_offset = offset;
dirty = true;
+ offset_changed();
}
if(next_in_buffer)
- next_in_buffer->update_buffer_offsets();
+ next_in_buffer->update_buffer_offset();
+
+ /* Do not resize the buffer here, as the offsets may change multiple times
+ before the buffer is actually used */
}
void Bufferable::update_buffer_data() 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();
-
- buffer->data(total_size, 0);
- for(const Bufferable *b=first; b; b=b->next_in_buffer)
+ if(buffer_offset+get_data_size()>=buffer->get_size())
{
- buffer->sub_data(b->buffer_offset, b->get_data_size(), b->get_data());
- b->dirty = false;
+ const Bufferable *last = this;
+ for(; last->next_in_buffer; last=last->next_in_buffer) ;
+
+ unsigned total_size = last->buffer_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();
+ dirty = false;
}
} // namespace GL