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

diff --git a/source/core/bufferable.cpp b/source/core/bufferable.cpp
index fcedc5be..d8f3c9c4 100644
--- a/source/core/bufferable.cpp
+++ b/source/core/bufferable.cpp
@@ -1,5 +1,4 @@
 #include <stdexcept>
-#include "buffer.h"
 #include "bufferable.h"
 #include "error.h"
 
@@ -70,11 +69,20 @@ void Bufferable::change_buffer(Buffer *buf)
 	}
 }
 
-size_t 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();
+	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()
@@ -119,14 +127,20 @@ void Bufferable::update_offset()
 
 void Bufferable::mark_dirty()
 {
-	dirty = true;
+	dirty = 0xFF;
 }
 
-void Bufferable::upload_data(char *target) const
+void Bufferable::upload_data(unsigned frame, char *target) const
 {
 	if(!buffer)
 		throw invalid_operation("Bufferable::upload_data");
 
+	unsigned multi_buf = buffer->get_multiplicity();
+	frame %= multi_buf;
+	uint8_t mask = 1<<frame;
+	if(!(dirty&mask))
+		return;
+
 	size_t data_size = get_data_size();
 	if(location_dirty)
 	{
@@ -140,33 +154,36 @@ void Bufferable::upload_data(char *target) const
 		copy(source, source+data_size, target);
 	}
 	else
-		buffer->sub_data(offset, data_size, get_data_pointer());
-	dirty = false;
+		buffer->sub_data(frame*buffer->get_size()+offset, data_size, get_data_pointer());
+	dirty &= ~mask;
+	if(!(dirty&((1<<multi_buf)-1)))
+		dirty = 0;
 }
 
-
-Bufferable::AsyncUpdater::AsyncUpdater(const Bufferable &b):
-	bufferable(b)
+Bufferable::AsyncUpdater *Bufferable::create_async_updater() const
 {
-	bufferable.buffer->require_size(bufferable.get_required_buffer_size());
-	mapped_address = reinterpret_cast<char *>(bufferable.buffer->map());
+	if(!buffer || buffer->get_multiplicity()>1)
+		throw invalid_operation("Bufferable::create_async_updater");
+	return new AsyncUpdater(*this);
 }
 
-Bufferable::AsyncUpdater::~AsyncUpdater()
-{
-	bufferable.buffer->unmap();
-}
+
+Bufferable::AsyncUpdater::AsyncUpdater(const Bufferable &b):
+	bufferable(b),
+	transfer(b.buffer->sub_data_async(0, bufferable.get_required_buffer_size()))
+{ }
 
 void Bufferable::AsyncUpdater::upload_data()
 {
-	bufferable.upload_data(mapped_address+bufferable.offset);
+	char *mapped_address = static_cast<char *>(transfer.get_address());
+	bufferable.upload_data(0, 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);
+			b->upload_data(0, 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);
+			b->upload_data(0, mapped_address+b->offset);
 }
 
 } // namespace GL