Add a function to set depth clip of EnvironmentMap

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

diff --git a/source/bufferable.cpp b/source/bufferable.cpp
index 4660e9c31b32f787bfc553326078da669063b0a5..3178e0adefa38f72e2d8aa22ecbae6769c50cdc7 100644 (file)
--- a/source/bufferable.cpp
+++ b/source/bufferable.cpp
@@ -1,4 +1,7 @@
 #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"
 
@@ -9,7 +12,7 @@ namespace GL {
 
 Bufferable::Bufferable():
        buffer(0),
-       buffer_offset(0),
+       offset(0),
        next_in_buffer(0),
        prev_in_buffer(0),
        dirty(false)
@@ -33,10 +36,19 @@ void Bufferable::use_buffer(Buffer *buf, Bufferable *prev)
        {
                prev_in_buffer = prev;
                if(prev_in_buffer)
+               {
+                       next_in_buffer = prev_in_buffer->next_in_buffer;
                        prev_in_buffer->next_in_buffer = this;
+               }
        }
 
-       update_buffer_offset();
+       dirty = true;
+       update_offset();
+}
+
+Bufferable::AsyncUpdater *Bufferable::refresh_async() const
+{
+       return dirty ? new AsyncUpdater(*this) : 0;
 }
 
 void Bufferable::unlink_from_buffer()
@@ -46,52 +58,116 @@ void Bufferable::unlink_from_buffer()
        if(next_in_buffer)
        {
                next_in_buffer->prev_in_buffer = prev_in_buffer;
-               next_in_buffer->update_buffer_offset();
+               next_in_buffer->update_offset();
        }
        prev_in_buffer = 0;
        next_in_buffer = 0;
+       buffer = 0;
 }
 
-void Bufferable::update_buffer_offset()
+void Bufferable::update_offset()
 {
-       unsigned offset = 0;
+       unsigned new_offset = 0;
        if(prev_in_buffer)
-               offset = prev_in_buffer->buffer_offset+prev_in_buffer->get_data_size();
+               new_offset = prev_in_buffer->offset+prev_in_buffer->get_data_size();
 
-       if(offset!=buffer_offset)
+       unsigned align = get_alignment();
+       new_offset += align-1;
+       new_offset -= new_offset%align;
+       if(new_offset!=offset)
        {
-               buffer_offset = offset;
+               offset = new_offset;
                dirty = true;
                offset_changed();
        }
 
        if(next_in_buffer)
-               next_in_buffer->update_buffer_offset();
+               next_in_buffer->update_offset();
 
-       /* Do not resize the buffer here, as the offsets may change multiple times
-       before the buffer is actually used */
+       /* Do not resize the buffer here, as more bufferables may be added before
+       the buffer is actually used. */
 }
 
-void Bufferable::update_buffer_data() const
+bool Bufferable::resize_buffer() const
 {
-       const Bufferable *first = this;
-       for(; first->prev_in_buffer; first=first->prev_in_buffer) ;
+       if(offset+get_data_size()>=buffer->get_size())
+       {
+               const Bufferable *last = this;
+               for(; last->next_in_buffer; last=last->next_in_buffer) ;
 
-       unsigned total_size = 0;
-       for(const Bufferable *b=first; b; b=b->next_in_buffer)
-               total_size += b->get_data_size();
+               unsigned total_size = last->offset+last->get_data_size();
 
-       if(total_size!=buffer->get_size())
+               if(total_size>buffer->get_size())
+               {
+                       buffer->data(total_size, 0);
+                       return true;
+               }
+       }
+
+       return false;
+}
+
+void Bufferable::update_buffer() const
+{
+       Conditional<BindRestore> _bind(!ARB_direct_state_access, buffer, buffer->get_type());
+
+       if(resize_buffer())
        {
-               buffer->data(total_size, 0);
-               // Resizing the buffer invalidates its contents.
-               for(const Bufferable *b=first; b; b=b->next_in_buffer)
-                       b->dirty = true;
+               /* 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(0);
+               for(const Bufferable *b=next_in_buffer; b; b=b->next_in_buffer)
+                       if(!b->dirty)
+                               b->upload_data(0);
        }
 
-       upload_data();
+       upload_data(0);
        dirty = false;
 }
 
+void Bufferable::upload_data(char *target) const
+{
+       if(target)
+       {
+               const char *source = reinterpret_cast<const char *>(get_data_pointer());
+               copy(source, source+get_data_size(), target);
+       }
+       else
+               buffer->sub_data(offset, get_data_size(), get_data_pointer());
+}
+
+
+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()
+{
+       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);
+                       b->dirty = false;
+               }
+       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);
+                       b->dirty = false;
+               }
+}
+
 } // namespace GL
 } // namespace Msp