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

diff --git a/source/bufferable.cpp b/source/bufferable.cpp
index 6b770a8f..e022a716 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,6 +43,7 @@ void Bufferable::use_buffer(Buffer *buf, Bufferable *prev)
 		}
 	}
 
+	location_dirty = true;
 	dirty = true;
 	update_offset();
 }
@@ -77,15 +79,17 @@ 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. */
+	else if(buffer && offset+get_data_size()>buffer->get_size())
+	{
+		location_dirty = true;
+		dirty = true;
+	}
 }
 
 bool Bufferable::resize_buffer() const
@@ -107,12 +111,12 @@ bool Bufferable::resize_buffer() const
 	return false;
 }
 
-void Bufferable::update_buffer() const
+void Bufferable::update_buffer_size() const
 {
-	Conditional<BindRestore> _bind(!ARB_direct_state_access, buffer, buffer->get_type());
-
 	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)
@@ -122,19 +126,25 @@ void Bufferable::update_buffer() const
 			if(!b->dirty)
 				b->upload_data(0);
 	}
-
-	upload_data(0);
 }
 
 void Bufferable::upload_data(char *target) const
 {
+	unsigned data_size = get_data_size();
+	if(location_dirty)
+	{
+		update_buffer_size();
+		location_changed(buffer, offset, data_size);
+		location_dirty = false;
+	}
+
 	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;
 }