X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbufferable.cpp;h=502c270c8f6bad09861841847e1dc71d70d006c7;hb=5fa0901a84cdba32f491a4e3997916f2fbb30863;hp=d07f57cc4e430f5d337c67cd7ebd47917eb3a456;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/core/bufferable.cpp b/source/core/bufferable.cpp
index d07f57cc..502c270c 100644
--- a/source/core/bufferable.cpp
+++ b/source/core/bufferable.cpp
@@ -1,23 +1,29 @@
 #include <stdexcept>
-#include <msp/core/raii.h>
-#include <msp/gl/extensions/arb_direct_state_access.h>
-#include "bindable.h"
 #include "buffer.h"
 #include "bufferable.h"
+#include "error.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-Bufferable::Bufferable():
-	buffer(0),
-	offset(0),
-	next_in_buffer(0),
-	prev_in_buffer(0),
-	location_dirty(false),
-	dirty(false)
-{ }
+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()
 {
@@ -44,7 +50,7 @@ void Bufferable::use_buffer(Buffer *buf, Bufferable *prev)
 	}
 
 	location_dirty = true;
-	dirty = true;
+	mark_dirty();
 	update_offset();
 }
 
@@ -54,26 +60,30 @@ 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(bool align) 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;
+	size_t size = last->offset+last->get_data_size();
+	if(align)
+	{
+		const Bufferable *first = this;
+		for(; first->prev_in_buffer; first=first->prev_in_buffer) ;
+		size_t alignment = first->get_alignment();
+		size += alignment-1;
+		size -= size%alignment;
+	}
+	return size;
 }
 
 void Bufferable::unlink_from_buffer()
@@ -93,18 +103,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)
@@ -112,17 +122,24 @@ 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
 {
-	unsigned data_size = get_data_size();
+	if(!buffer)
+		throw invalid_operation("Bufferable::upload_data");
+
+	size_t data_size = get_data_size();
 	if(location_dirty)
 	{
 		buffer->require_size(offset+data_size);
-		location_changed(buffer, offset, data_size);
 		location_dirty = false;
 	}