update_offset();
}
+void Bufferable::change_buffer(Buffer *buf)
+{
+ for(Bufferable *b=this; b; b=b->next_in_buffer)
+ {
+ b->buffer = buf;
+ b->location_dirty = true;
+ b->dirty = true;
+ }
+ for(Bufferable *b=prev_in_buffer; b; b=b->prev_in_buffer)
+ {
+ b->buffer = buf;
+ b->location_dirty = true;
+ b->dirty = true;
+ }
+}
+
+unsigned 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;
prev_in_buffer = 0;
next_in_buffer = 0;
buffer = 0;
+ offset = 0;
}
void Bufferable::update_offset()
}
}
-bool Bufferable::resize_buffer() const
-{
- if(offset+get_data_size()>=buffer->get_size())
- {
- 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);
- return true;
- }
- }
-
- return false;
-}
-
-void Bufferable::update_buffer_size() const
-{
- if(resize_buffer())
- {
- Conditional<BindRestore> _bind(!ARB_direct_state_access, buffer, buffer->get_type());
-
- /* Resizing the buffer invalidates its contents. Non-dirty data may
- be in use, so reupload it. */
- for(const Bufferable *b=prev_in_buffer; b; b=b->prev_in_buffer)
- if(!b->dirty)
- b->upload_data(0);
- for(const Bufferable *b=next_in_buffer; b; b=b->next_in_buffer)
- if(!b->dirty)
- b->upload_data(0);
- }
-}
-
void Bufferable::upload_data(char *target) const
{
unsigned data_size = get_data_size();
if(location_dirty)
{
- update_buffer_size();
+ buffer->require_size(offset+data_size);
location_changed(buffer, offset, data_size);
location_dirty = false;
}
Bufferable::AsyncUpdater::AsyncUpdater(const Bufferable &b):
bufferable(b)
{
- buffer_resized = bufferable.resize_buffer();
- mapped_address = reinterpret_cast<char *>(bufferable.buffer->map(WRITE_ONLY));
+ bufferable.buffer->require_size(bufferable.get_required_buffer_size());
+ mapped_address = reinterpret_cast<char *>(bufferable.buffer->map());
}
Bufferable::AsyncUpdater::~AsyncUpdater()
bufferable.upload_data(mapped_address+bufferable.offset);
// Update all bufferables in the same buffer at once
for(const Bufferable *b=bufferable.prev_in_buffer; b; b=b->prev_in_buffer)
- if(b->dirty || buffer_resized)
+ if(b->dirty)
b->upload_data(mapped_address+b->offset);
for(const Bufferable *b=bufferable.next_in_buffer; b; b=b->next_in_buffer)
- if(b->dirty || buffer_resized)
+ if(b->dirty)
b->upload_data(mapped_address+b->offset);
}