X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbufferable.cpp;h=04793fb793905ebfae448899195873879d6ff542;hb=98cc25ffe956bc162c053c96df659ba40dfe2d6e;hp=5c7cb9e0891a74a753987dd32735a128228c6def;hpb=bd3e61a3d71a527b7b87197c2f52c5cf342aba81;p=libs%2Fgl.git

diff --git a/source/bufferable.cpp b/source/bufferable.cpp
index 5c7cb9e0..04793fb7 100644
--- a/source/bufferable.cpp
+++ b/source/bufferable.cpp
@@ -1,4 +1,5 @@
 #include <stdexcept>
+#include "bindable.h"
 #include "buffer.h"
 #include "bufferable.h"
 
@@ -9,7 +10,7 @@ namespace GL {
 
 Bufferable::Bufferable():
 	buffer(0),
-	buffer_offset(0),
+	offset(0),
 	next_in_buffer(0),
 	prev_in_buffer(0),
 	dirty(false)
@@ -33,10 +34,13 @@ void Bufferable::use_buffer(Buffer *buf, Bufferable *prev)
 	{
 		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_offsets();
+	update_offset();
 }
 
 void Bufferable::unlink_from_buffer()
@@ -46,43 +50,77 @@ 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_offset();
 	}
 	prev_in_buffer = 0;
 	next_in_buffer = 0;
+	buffer = 0;
 }
 
-void Bufferable::update_buffer_offsets()
+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_offsets();
+		next_in_buffer->update_offset();
+
+	/* Do not resize the buffer here, as more bufferables may be added before
+	the buffer is actually used. */
 }
 
-void Bufferable::update_buffer_data() const
+bool Bufferable::resize_buffer() const
 {
-	const Bufferable *first = this;
-	for(; first->prev_in_buffer; first=first->prev_in_buffer) ;
+	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();
 
-	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())
+		{
+			buffer->data(total_size, 0);
+			return true;
+		}
+	}
+
+	return false;
+}
 
-	buffer->data(total_size, 0);
-	for(const Bufferable *b=first; b; b=b->next_in_buffer)
+void Bufferable::update_buffer() const
+{
+	BindRestore bind(buffer, buffer->get_type());
+	if(resize_buffer())
 	{
-		buffer->sub_data(b->buffer_offset, b->get_data_size(), b->get_data());
-		b->dirty = false;
+		/* 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();
+		for(const Bufferable *b=next_in_buffer; b; b=b->next_in_buffer)
+			if(!b->dirty)
+				b->upload_data();
 	}
+
+	upload_data();
+	dirty = false;
+}
+
+void Bufferable::upload_data() const
+{
+	buffer->sub_data(offset, get_data_size(), get_data_pointer());
 }
 
 } // namespace GL