X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbufferable.h;h=cbbde4e1b93f1e07266c097c150774f2b5621d3c;hp=66a6db1871952a2a7e7940bd5f9f931cd88eb808;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=b59c47a7ed2ed3f69a3349a2d76ef02891f0c685

diff --git a/source/bufferable.h b/source/bufferable.h
index 66a6db18..cbbde4e1 100644
--- a/source/bufferable.h
+++ b/source/bufferable.h
@@ -20,7 +20,6 @@ public:
 	private:
 		const Bufferable &bufferable;
 		char *mapped_address;
-		bool buffer_resized;
 
 	public:
 		AsyncUpdater(const Bufferable &);
@@ -34,6 +33,7 @@ private:
 	unsigned offset;
 	Bufferable *next_in_buffer;
 	Bufferable *prev_in_buffer;
+	mutable bool location_dirty;
 protected:
 	mutable bool dirty;
 
@@ -45,9 +45,18 @@ public:
 	buffer, and this object is inserted after it. */
 	void use_buffer(Buffer *buf, Bufferable *prev = 0);
 
+	/** Sets the buffer for the entire chain of objects. */
+	void change_buffer(Buffer *);
+
+	/** Returns the total amount of storage required by this object and others
+	in the same chain, including any alignment between objects. */
+	unsigned get_required_buffer_size() const;
+
 	/** Uploads new data into the buffer if necessary. */
-	void refresh() const { if(dirty) update_buffer(); }
+	void refresh() const { if(buffer && dirty) upload_data(0); }
 
+	/** Returns an object which can be used to upload data to the buffer using
+	mapped memory. */
 	AsyncUpdater *refresh_async() const;
 
 private:
@@ -58,9 +67,6 @@ public:
 	const Buffer *get_buffer() const { return buffer; }
 
 protected:
-	/** Returns the buffer in which the data is stored. */
-	Buffer *get_mutable_buffer() const { return buffer; }
-
 	/** Returns the amount of data to be stored in the buffer, in bytes. */
 	virtual unsigned get_data_size() const = 0;
 
@@ -79,19 +85,13 @@ protected:
 	/** Returns the offset where the data should be uploaded. */
 	unsigned get_offset() const { return offset; }
 
-	/** Called when the offset for the data has changed. */
-	virtual void offset_changed() { }
+	/** Called when the target buffer or offset within it has changed. */
+	virtual void location_changed(Buffer *, unsigned, unsigned) const { }
 
 private:
-	bool resize_buffer() const;
-
-protected:
-	/** Resizes the buffer if necessary and calls upload_data(). */
-	void update_buffer() const;
-
 	/** Uploads data to the buffer.  Receives pointer to mapped buffer memory as
-	parameter.  If null, buffer interface should be used instead. */
-	virtual void upload_data(char *) const;
+	parameter, or null to use the buffer upload interface. */
+	void upload_data(char *) const;
 };
 
 } // namespace GL