X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbufferable.cpp;h=4544c508cb072c4e47e02c357aab452d41e2a754;hb=66181b3f47322ffc9b8aebf04a8c222abe1a75a2;hp=6b770a8f68f2c447bb18fe608930cba4bf9e6ab7;hpb=bb8b03770053cbddda88577e261ec4ee482e6c5c;p=libs%2Fgl.git

diff --git a/source/bufferable.cpp b/source/bufferable.cpp
index 6b770a8f..4544c508 100644
--- a/source/bufferable.cpp
+++ b/source/bufferable.cpp
@@ -15,6 +15,7 @@ Bufferable::Bufferable():
 	offset(0),
 	next_in_buffer(0),
 	prev_in_buffer(0),
+	location_dirty(false),
 	dirty(false)
 { }
 
@@ -42,10 +43,34 @@ void Bufferable::use_buffer(Buffer *buf, Bufferable *prev)
 		}
 	}
 
+	location_dirty = true;
 	dirty = true;
 	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;
@@ -77,64 +102,36 @@ void Bufferable::update_offset()
 	if(new_offset!=offset)
 	{
 		offset = new_offset;
+		location_dirty = true;
 		dirty = true;
-		offset_changed();
 	}
 
 	if(next_in_buffer)
 		next_in_buffer->update_offset();
-
-	/* Do not resize the buffer here, as more bufferables may be added before
-	the buffer is actually used. */
-}
-
-bool Bufferable::resize_buffer() const
-{
-	if(offset+get_data_size()>=buffer->get_size())
+	else if(buffer && 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;
-		}
+		location_dirty = true;
+		dirty = true;
 	}
-
-	return false;
 }
 
-void Bufferable::update_buffer() const
+void Bufferable::upload_data(char *target) const
 {
-	Conditional<BindRestore> _bind(!ARB_direct_state_access, buffer, buffer->get_type());
-
-	if(resize_buffer())
+	unsigned data_size = get_data_size();
+	if(location_dirty)
 	{
-		/* 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);
+		buffer->require_size(offset+data_size);
+		location_changed(buffer, offset, data_size);
+		location_dirty = false;
 	}
 
-	upload_data(0);
-}
-
-void Bufferable::upload_data(char *target) const
-{
 	if(target)
 	{
 		const char *source = reinterpret_cast<const char *>(get_data_pointer());
-		copy(source, source+get_data_size(), target);
+		copy(source, source+data_size, target);
 	}
 	else
-		buffer->sub_data(offset, get_data_size(), get_data_pointer());
+		buffer->sub_data(offset, data_size, get_data_pointer());
 	dirty = false;
 }
 
@@ -142,8 +139,8 @@ void Bufferable::upload_data(char *target) const
 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()
@@ -156,10 +153,10 @@ void Bufferable::AsyncUpdater::upload_data()
 	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);
 }