X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbufferable.cpp;h=fcedc5becd666efb16ef780a73c4bc8fa24fe5c5;hb=97818e67b2543a6075c13e6bf22c296757b975e5;hp=a0ff06c8f25802f782c37b599f583019073cffb6;hpb=69f8cd98ee3b78f2e4ee509d30e5e828456ef702;p=libs%2Fgl.git

diff --git a/source/core/bufferable.cpp b/source/core/bufferable.cpp
index a0ff06c8..fcedc5be 100644
--- a/source/core/bufferable.cpp
+++ b/source/core/bufferable.cpp
@@ -8,6 +8,23 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+Bufferable::Bufferable(Bufferable &&other):
+	buffer(other.buffer),
+	offset(other.offset),
+	next_in_buffer(other.next_in_buffer),
+	prev_in_buffer(other.prev_in_buffer),
+	location_dirty(other.location_dirty),
+	dirty(other.dirty)
+{
+	other.buffer = 0;
+	other.next_in_buffer = 0;
+	other.prev_in_buffer = 0;
+	if(next_in_buffer)
+		next_in_buffer->prev_in_buffer = this;
+	if(prev_in_buffer)
+		prev_in_buffer->next_in_buffer = this;
+}
+
 Bufferable::~Bufferable()
 {
 	unlink_from_buffer();
@@ -33,7 +50,7 @@ void Bufferable::use_buffer(Buffer *buf, Bufferable *prev)
 	}
 
 	location_dirty = true;
-	dirty = true;
+	mark_dirty();
 	update_offset();
 }
 
@@ -43,17 +60,17 @@ void Bufferable::change_buffer(Buffer *buf)
 	{
 		b->buffer = buf;
 		b->location_dirty = true;
-		b->dirty = true;
+		b->mark_dirty();
 	}
 	for(Bufferable *b=prev_in_buffer; b; b=b->prev_in_buffer)
 	{
 		b->buffer = buf;
 		b->location_dirty = true;
-		b->dirty = true;
+		b->mark_dirty();
 	}
 }
 
-unsigned Bufferable::get_required_buffer_size() const
+size_t Bufferable::get_required_buffer_size() const
 {
 	const Bufferable *last = this;
 	for(; last->next_in_buffer; last=last->next_in_buffer) ;
@@ -77,18 +94,18 @@ void Bufferable::unlink_from_buffer()
 
 void Bufferable::update_offset()
 {
-	unsigned new_offset = 0;
+	size_t new_offset = 0;
 	if(prev_in_buffer)
 		new_offset = prev_in_buffer->offset+prev_in_buffer->get_data_size();
 
-	unsigned align = get_alignment();
+	size_t align = get_alignment();
 	new_offset += align-1;
 	new_offset -= new_offset%align;
 	if(new_offset!=offset)
 	{
 		offset = new_offset;
 		location_dirty = true;
-		dirty = true;
+		mark_dirty();
 	}
 
 	if(next_in_buffer)
@@ -96,16 +113,21 @@ void Bufferable::update_offset()
 	else if(buffer && offset+get_data_size()>buffer->get_size())
 	{
 		location_dirty = true;
-		dirty = true;
+		mark_dirty();
 	}
 }
 
+void Bufferable::mark_dirty()
+{
+	dirty = true;
+}
+
 void Bufferable::upload_data(char *target) const
 {
 	if(!buffer)
 		throw invalid_operation("Bufferable::upload_data");
 
-	unsigned data_size = get_data_size();
+	size_t data_size = get_data_size();
 	if(location_dirty)
 	{
 		buffer->require_size(offset+data_size);