X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbufferable.cpp;h=d07f57cc4e430f5d337c67cd7ebd47917eb3a456;hp=12e0aef7d345da45e948820606211926c1de9b49;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=719578516a4d44a6f39eac3b074ce9f6180b5d53

diff --git a/source/bufferable.cpp b/source/bufferable.cpp
index 12e0aef7..d07f57cc 100644
--- a/source/bufferable.cpp
+++ b/source/bufferable.cpp
@@ -1,4 +1,7 @@
 #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"
 
@@ -9,9 +12,10 @@ namespace GL {
 
 Bufferable::Bufferable():
 	buffer(0),
-	buffer_offset(0),
+	offset(0),
 	next_in_buffer(0),
 	prev_in_buffer(0),
+	location_dirty(false),
 	dirty(false)
 { }
 
@@ -33,10 +37,43 @@ 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;
+		}
+	}
+
+	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;
 	}
+}
 
-	update_buffer_offset();
+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;
 }
 
 void Bufferable::unlink_from_buffer()
@@ -46,55 +83,83 @@ void Bufferable::unlink_from_buffer()
 	if(next_in_buffer)
 	{
 		next_in_buffer->prev_in_buffer = prev_in_buffer;
-		next_in_buffer->update_buffer_offset();
+		next_in_buffer->update_offset();
 	}
 	prev_in_buffer = 0;
 	next_in_buffer = 0;
+	buffer = 0;
+	offset = 0;
 }
 
-void Bufferable::update_buffer_offset()
+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;
+		location_dirty = true;
 		dirty = true;
-		offset_changed();
 	}
 
 	if(next_in_buffer)
-		next_in_buffer->update_buffer_offset();
-
-	/* Do not resize the buffer here, as the offsets may change multiple times
-	before the buffer is actually used */
+		next_in_buffer->update_offset();
+	else if(buffer && offset+get_data_size()>buffer->get_size())
+	{
+		location_dirty = true;
+		dirty = true;
+	}
 }
 
-void Bufferable::update_buffer_data() const
+void Bufferable::upload_data(char *target) const
 {
-	if(buffer_offset+get_data_size()>=buffer->get_size())
+	unsigned data_size = get_data_size();
+	if(location_dirty)
 	{
-		const Bufferable *last = this;
-		for(; last->next_in_buffer; last=last->next_in_buffer) ;
-
-		unsigned total_size = last->buffer_offset+last->get_data_size();
-
-		if(total_size>buffer->get_size())
-		{
-			buffer->data(total_size, 0);
-			/* Resizing the buffer invalidates its contents.  Non-dirty data may
-			be in use, so reupload it. */
-			for(const Bufferable *b=last; b; b=b->prev_in_buffer)
-				if(!b->dirty)
-					b->upload_data();
-		}
+		buffer->require_size(offset+data_size);
+		location_changed(buffer, offset, data_size);
+		location_dirty = false;
 	}
 
-	upload_data();
+	if(target)
+	{
+		const char *source = reinterpret_cast<const char *>(get_data_pointer());
+		copy(source, source+data_size, target);
+	}
+	else
+		buffer->sub_data(offset, data_size, get_data_pointer());
 	dirty = false;
 }
 
+
+Bufferable::AsyncUpdater::AsyncUpdater(const Bufferable &b):
+	bufferable(b)
+{
+	bufferable.buffer->require_size(bufferable.get_required_buffer_size());
+	mapped_address = reinterpret_cast<char *>(bufferable.buffer->map());
+}
+
+Bufferable::AsyncUpdater::~AsyncUpdater()
+{
+	bufferable.buffer->unmap();
+}
+
+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)
+			b->upload_data(mapped_address+b->offset);
+	for(const Bufferable *b=bufferable.next_in_buffer; b; b=b->next_in_buffer)
+		if(b->dirty)
+			b->upload_data(mapped_address+b->offset);
+}
+
 } // namespace GL
 } // namespace Msp