Check for non-null buffer in Bufferable's refresh function

[libs/gl.git] / source / bufferable.h

diff --git a/source/bufferable.h b/source/bufferable.h
index d7d7e45fe2183fa606395bda73f184a1f3ace282..f47ef4cabf17c1664838195778910886fcda778b 100644 (file)
--- a/source/bufferable.h
+++ b/source/bufferable.h
@@ -14,6 +14,21 @@ uploading fresh data to the buffer.
 */
 class Bufferable
 {
+public:
+       class AsyncUpdater
+       {
+       private:
+               const Bufferable &bufferable;
+               char *mapped_address;
+               bool buffer_resized;
+
+       public:
+               AsyncUpdater(const Bufferable &);
+               ~AsyncUpdater();
+
+               void upload_data();
+       };
+
 private:
        Buffer *buffer;
        unsigned offset;
@@ -22,7 +37,6 @@ private:
 protected:
        mutable bool dirty;
 
-protected:
        Bufferable();
 public:
        virtual ~Bufferable();
@@ -32,14 +46,20 @@ public:
        void use_buffer(Buffer *buf, Bufferable *prev = 0);
 
        /** Uploads new data into the buffer if necessary. */
-       void refresh() const { if(dirty) update_buffer(); }
+       void refresh() const { if(buffer && dirty) update_buffer(); }
+
+       AsyncUpdater *refresh_async() const;
 
 private:
        void unlink_from_buffer();
 
+public:
+       /** Returns the buffer in which the data is stored. */
+       const Buffer *get_buffer() const { return buffer; }
+
 protected:
        /** Returns the buffer in which the data is stored. */
-       Buffer *get_buffer() const { return buffer; }
+       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;
@@ -69,8 +89,9 @@ protected:
        /** Resizes the buffer if necessary and calls upload_data(). */
        void update_buffer() const;
 
-       /** Uploads data to the buffer. */
-       virtual void upload_data() 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;
 };
 
 } // namespace GL