Use RAII binders in place of manual binding

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

diff --git a/source/buffer.cpp b/source/buffer.cpp
index d8bb28028ee686380e48b77613c039906df40a35..61670cf9d378245f9a96ddead7f0fcea32ffb584 100644 (file)
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -45,19 +45,15 @@ void Buffer::set_usage(BufferUsage u)
 
 void Buffer::data(unsigned sz, const void *d)
 {
-       const Buffer *old = current(type);
-       bind();
+       BindRestore _bind(this, type);
        glBufferData(type, sz, d, usage);
        size = sz;
-       restore(old, type);
 }
 
 void Buffer::sub_data(unsigned off, unsigned sz, const void *d)
 {
-       const Buffer *old = current(type);
-       bind();
+       BindRestore _bind(this, type);
        glBufferSubData(type, off, sz, d);
-       restore(old, type);
 }
 
 BufferRange *Buffer::create_range(unsigned s, unsigned o)
@@ -107,17 +103,6 @@ bool Buffer::set_current(BufferType type, const Buffer *buf)
        return true;
 }
 
-void Buffer::restore(const Buffer *buf, BufferType type)
-{
-       if(buf!=current(type))
-       {
-               if(buf)
-                       buf->bind_to(type);
-               else
-                       unbind_from(type);
-       }
-}
-
 
 vector<const BufferRange *> BufferRange::bound_uniform;