Remove the deprecated ProgramBuilder class

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

diff --git a/source/bufferable.cpp b/source/bufferable.cpp
index e6b52ddfa53f622f1bdcbffe692dc337db92cb48..d07f57cc4e430f5d337c67cd7ebd47917eb3a456 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,10 +43,34 @@ void Bufferable::use_buffer(Buffer *buf, Bufferable *prev)
                }
        }
 
+       location_dirty = true;
        dirty = true;
        update_offset();
 }
 
+void Bufferable::change_buffer(Buffer *buf)
+{
+       for(Bufferable *b=this; b; b=b->next_in_buffer)
+       {
+               b->buffer = buf;
+               b->location_dirty = true;
+               b->dirty = true;
+       }
+       for(Bufferable *b=prev_in_buffer; b; b=b->prev_in_buffer)
+       {
+               b->buffer = buf;
+               b->location_dirty = true;
+               b->dirty = true;
+       }
+}
+
+unsigned Bufferable::get_required_buffer_size() const
+{
+       const Bufferable *last = this;
+       for(; last->next_in_buffer; last=last->next_in_buffer) ;
+       return last->offset+last->get_data_size();
+}
+
 Bufferable::AsyncUpdater *Bufferable::refresh_async() const
 {
        return dirty ? new AsyncUpdater(*this) : 0;
@@ -61,6 +88,7 @@ void Bufferable::unlink_from_buffer()
        prev_in_buffer = 0;
        next_in_buffer = 0;
        buffer = 0;
+       offset = 0;
 }
 
 void Bufferable::update_offset()
@@ -75,72 +103,45 @@ 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. */
-}
-
-bool Bufferable::resize_buffer() const
-{
-       if(offset+get_data_size()>=buffer->get_size())
+       else if(buffer && offset+get_data_size()>buffer->get_size())
        {
-               const Bufferable *last = this;
-               for(; last->next_in_buffer; last=last->next_in_buffer) ;
-
-               unsigned total_size = last->offset+last->get_data_size();
-
-               if(total_size>buffer->get_size())
-               {
-                       buffer->data(total_size, 0);
-                       return true;
-               }
+               location_dirty = true;
+               dirty = true;
        }
-
-       return false;
 }
 
-void Bufferable::update_buffer() const
+void Bufferable::upload_data(char *target) const
 {
-       BindRestore bind(buffer, buffer->get_type());
-       if(resize_buffer())
+       unsigned data_size = get_data_size();
+       if(location_dirty)
        {
-               /* 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);
+               buffer->require_size(offset+data_size);
+               location_changed(buffer, offset, data_size);
+               location_dirty = false;
        }
 
-       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);
+               copy(source, source+data_size, target);
        }
        else
-               buffer->sub_data(offset, get_data_size(), get_data_pointer());
+               buffer->sub_data(offset, data_size, get_data_pointer());
+       dirty = false;
 }
 
 
 Bufferable::AsyncUpdater::AsyncUpdater(const Bufferable &b):
        bufferable(b)
 {
-       buffer_resized = bufferable.resize_buffer();
-       mapped_address = reinterpret_cast<char *>(bufferable.buffer->map(WRITE_ONLY));
+       bufferable.buffer->require_size(bufferable.get_required_buffer_size());
+       mapped_address = reinterpret_cast<char *>(bufferable.buffer->map());
 }
 
 Bufferable::AsyncUpdater::~AsyncUpdater()
@@ -153,17 +154,11 @@ 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)
-               {
+               if(b->dirty)
                        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)
-               {
+               if(b->dirty)
                        b->upload_data(mapped_address+b->offset);
-                       b->dirty = false;
-               }
 }
 
 } // namespace GL