Further refactor Bufferable's API for derived classes

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

diff --git a/source/bufferable.cpp b/source/bufferable.cpp
index 04793fb793905ebfae448899195873879d6ff542..e022a71676eed0a52ee36ed9be087b3eac1e9999 100644 (file)
--- a/source/bufferable.cpp
+++ b/source/bufferable.cpp
@@ -1,4 +1,6 @@
 #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"
@@ -13,6 +15,7 @@ Bufferable::Bufferable():
        offset(0),
        next_in_buffer(0),
        prev_in_buffer(0),
+       location_dirty(false),
        dirty(false)
 { }
 
@@ -40,9 +43,16 @@ void Bufferable::use_buffer(Buffer *buf, Bufferable *prev)
                }
        }
 
+       location_dirty = true;
+       dirty = true;
        update_offset();
 }
 
+Bufferable::AsyncUpdater *Bufferable::refresh_async() const
+{
+       return dirty ? new AsyncUpdater(*this) : 0;
+}
+
 void Bufferable::unlink_from_buffer()
 {
        if(prev_in_buffer)
@@ -69,15 +79,17 @@ void Bufferable::update_offset()
        if(new_offset!=offset)
        {
                offset = new_offset;
+               location_dirty = true;
                dirty = true;
-               offset_changed();
        }
 
        if(next_in_buffer)
                next_in_buffer->update_offset();
-
-       /* Do not resize the buffer here, as more bufferables may be added before
-       the buffer is actually used. */
+       else if(buffer && offset+get_data_size()>buffer->get_size())
+       {
+               location_dirty = true;
+               dirty = true;
+       }
 }
 
 bool Bufferable::resize_buffer() const
@@ -99,28 +111,66 @@ bool Bufferable::resize_buffer() const
        return false;
 }
 
-void Bufferable::update_buffer() const
+void Bufferable::update_buffer_size() const
 {
-       BindRestore bind(buffer, buffer->get_type());
        if(resize_buffer())
        {
+               Conditional<BindRestore> _bind(!ARB_direct_state_access, buffer, buffer->get_type());
+
                /* Resizing the buffer invalidates its contents.  Non-dirty data may
                be in use, so reupload it. */
                for(const Bufferable *b=prev_in_buffer; b; b=b->prev_in_buffer)
                        if(!b->dirty)
-                               b->upload_data();
+                               b->upload_data(0);
                for(const Bufferable *b=next_in_buffer; b; b=b->next_in_buffer)
                        if(!b->dirty)
-                               b->upload_data();
+                               b->upload_data(0);
+       }
+}
+
+void Bufferable::upload_data(char *target) const
+{
+       unsigned data_size = get_data_size();
+       if(location_dirty)
+       {
+               update_buffer_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;
 }
 
-void Bufferable::upload_data() const
+
+Bufferable::AsyncUpdater::AsyncUpdater(const Bufferable &b):
+       bufferable(b)
+{
+       buffer_resized = bufferable.resize_buffer();
+       mapped_address = reinterpret_cast<char *>(bufferable.buffer->map(WRITE_ONLY));
+}
+
+Bufferable::AsyncUpdater::~AsyncUpdater()
+{
+       bufferable.buffer->unmap();
+}
+
+void Bufferable::AsyncUpdater::upload_data()
 {
-       buffer->sub_data(offset, get_data_size(), get_data_pointer());
+       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 || buffer_resized)
+                       b->upload_data(mapped_address+b->offset);
+       for(const Bufferable *b=bufferable.next_in_buffer; b; b=b->next_in_buffer)
+               if(b->dirty || buffer_resized)
+                       b->upload_data(mapped_address+b->offset);
 }
 
 } // namespace GL