Drop Id tags and copyright notices from files

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

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 17ae494f72dc37a0892fdf282af33665d8723c49..395057cd90ff4bf61e95a7be7c833fefaa20515f 100644 (file)
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "arb_vertex_buffer_object.h"
 #include "extension.h"
 #include "buffer.h"
@@ -28,18 +21,6 @@ Buffer::~Buffer()
        glDeleteBuffersARB(1, &id);
 }
 
-void Buffer::bind(BufferType t) const
-{
-       glBindBufferARB(t, id);
-       binding(t) = this;
-}
-
-void Buffer::maybe_bind() const
-{
-       if(binding(type)!=this)
-               bind();
-}
-
 void Buffer::set_usage(BufferUsage u)
 {
        usage = u;
@@ -47,17 +28,31 @@ void Buffer::set_usage(BufferUsage u)
 
 void Buffer::data(unsigned size, const void *d)
 {
-       maybe_bind();
+       const Buffer *old = current(type);
+       bind();
        glBufferDataARB(type, size, d, usage);
+       restore(old, type);
 }
 
 void Buffer::sub_data(unsigned offset, unsigned size, const void *d)
 {
-       maybe_bind();
+       const Buffer *old = current(type);
+       bind();
        glBufferSubDataARB(type, offset, size, d);
+       restore(old, type);
+}
+
+void Buffer::bind_to(BufferType t) const
+{
+       const Buffer *&ptr = binding(t);
+       if(ptr!=this)
+       {
+               glBindBufferARB(t, id);
+               ptr = this;
+       }
 }
 
-void Buffer::unbind(BufferType type)
+void Buffer::unbind_from(BufferType type)
 {
        const Buffer *&ptr = binding(type);
        if(ptr)
@@ -79,6 +74,17 @@ const Buffer *&Buffer::binding(BufferType type)
        }
 }
 
+void Buffer::restore(const Buffer *buf, BufferType type)
+{
+       if(buf!=current(type))
+       {
+               if(buf)
+                       buf->bind_to(type);
+               else
+                       unbind_from(type);
+       }
+}
+
 const Buffer *Buffer::bound[4] = { 0, 0, 0, 0 };
 
 } // namespace GL