X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbufferable.h;h=d49f0149ca4cb79bd659d8abeccdf7ce579cdf13;hb=11a5d4f2a35dfdcf61e16d4fcfba22e20ea6a3db;hp=b430b726277c657fac569fb334bf5c69f624409e;hpb=97818e67b2543a6075c13e6bf22c296757b975e5;p=libs%2Fgl.git

diff --git a/source/core/bufferable.h b/source/core/bufferable.h
index b430b726..d49f0149 100644
--- a/source/core/bufferable.h
+++ b/source/core/bufferable.h
@@ -2,12 +2,11 @@
 #define MSP_GL_BUFFERABLE_H_
 
 #include <msp/core/noncopyable.h>
+#include "buffer.h"
 
 namespace Msp {
 namespace GL {
 
-class Buffer;
-
 /**
 Base class for things that can store data in buffers.  Multiple Bufferables
 may be put in the same buffer.
@@ -26,11 +25,10 @@ public:
 	{
 	private:
 		const Bufferable &bufferable;
-		char *mapped_address;
+		Buffer::AsyncTransfer transfer;
 
 	public:
 		AsyncUpdater(const Bufferable &);
-		~AsyncUpdater();
 
 		void upload_data();
 	};
@@ -41,7 +39,7 @@ private:
 	Bufferable *next_in_buffer = 0;
 	Bufferable *prev_in_buffer = 0;
 	mutable bool location_dirty = false;
-	mutable bool dirty = false;
+	mutable uint8_t dirty = 0;
 
 protected:
 	Bufferable() = default;
@@ -60,14 +58,14 @@ public:
 
 	/** Returns the total amount of storage required by this object and others
 	in the same chain, including any padding required by object alignment. */
-	std::size_t get_required_buffer_size() const;
+	std::size_t get_required_buffer_size(bool = false) const;
 
 	/** Uploads new data into the buffer if necessary. */
-	void refresh() const { if(dirty) upload_data(0); }
+	void refresh(unsigned f) const { if(dirty) upload_data(f, 0); }
 
 	/** Returns an object which can be used to upload data to the buffer using
 	mapped memory.  If data is not dirty, returns null. */
-	AsyncUpdater *refresh_async() const { return dirty ? new AsyncUpdater(*this) : 0; }
+	AsyncUpdater *refresh_async() const { return dirty ? create_async_updater() : 0; }
 
 private:
 	void unlink_from_buffer();
@@ -103,7 +101,9 @@ public:
 private:
 	/** Uploads data to the buffer.  Receives pointer to mapped buffer memory as
 	parameter, or null to use the buffer upload interface. */
-	void upload_data(char *) const;
+	void upload_data(unsigned, char *) const;
+
+	AsyncUpdater *create_async_updater() const;
 };
 
 } // namespace GL