Check the flat qualifier from the correct member

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

diff --git a/source/bufferable.cpp b/source/bufferable.cpp
deleted file mode 100644 (file)
index 12e0aef..0000000
--- a/source/bufferable.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-#include <stdexcept>
-#include "buffer.h"
-#include "bufferable.h"
-
-using namespace std;
-
-namespace Msp {
-namespace GL {
-
-Bufferable::Bufferable():
-       buffer(0),
-       buffer_offset(0),
-       next_in_buffer(0),
-       prev_in_buffer(0),
-       dirty(false)
-{ }
-
-Bufferable::~Bufferable()
-{
-       unlink_from_buffer();
-}
-
-void Bufferable::use_buffer(Buffer *buf, Bufferable *prev)
-{
-       if(prev && buf!=prev->buffer)
-               throw invalid_argument("Bufferable::use_buffer");
-
-       if(buffer)
-               unlink_from_buffer();
-
-       buffer = buf;
-       if(buffer)
-       {
-               prev_in_buffer = prev;
-               if(prev_in_buffer)
-                       prev_in_buffer->next_in_buffer = this;
-       }
-
-       update_buffer_offset();
-}
-
-void Bufferable::unlink_from_buffer()
-{
-       if(prev_in_buffer)
-               prev_in_buffer->next_in_buffer = next_in_buffer;
-       if(next_in_buffer)
-       {
-               next_in_buffer->prev_in_buffer = prev_in_buffer;
-               next_in_buffer->update_buffer_offset();
-       }
-       prev_in_buffer = 0;
-       next_in_buffer = 0;
-}
-
-void Bufferable::update_buffer_offset()
-{
-       unsigned offset = 0;
-       if(prev_in_buffer)
-               offset = prev_in_buffer->buffer_offset+prev_in_buffer->get_data_size();
-
-       if(offset!=buffer_offset)
-       {
-               buffer_offset = offset;
-               dirty = true;
-               offset_changed();
-       }
-
-       if(next_in_buffer)
-               next_in_buffer->update_buffer_offset();
-
-       /* Do not resize the buffer here, as the offsets may change multiple times
-       before the buffer is actually used */
-}
-
-void Bufferable::update_buffer_data() const
-{
-       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->buffer_offset+last->get_data_size();
-
-               if(total_size>buffer->get_size())
-               {
-                       buffer->data(total_size, 0);
-                       /* Resizing the buffer invalidates its contents.  Non-dirty data may
-                       be in use, so reupload it. */
-                       for(const Bufferable *b=last; b; b=b->prev_in_buffer)
-                               if(!b->dirty)
-                                       b->upload_data();
-               }
-       }
-
-       upload_data();
-       dirty = false;
-}
-
-} // namespace GL
-} // namespace Msp