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 5a0f4762a22b287ed266c2acb15850889acfc67a..61670cf9d378245f9a96ddead7f0fcea32ffb584 100644 (file)
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -1,8 +1,10 @@
 #include <stdexcept>
-#include "arb_pixel_buffer_object.h"
-#include "arb_uniform_buffer_object.h"
-#include "arb_vertex_buffer_object.h"
+#include <msp/gl/extensions/arb_pixel_buffer_object.h>
+#include <msp/gl/extensions/arb_uniform_buffer_object.h>
+#include <msp/gl/extensions/arb_vertex_buffer_object.h>
 #include "buffer.h"
+#include "error.h"
+#include "mesh.h"
 #include "misc.h"
 
 using namespace std;
@@ -43,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)
@@ -67,12 +65,17 @@ void Buffer::bind_to(BufferType t) const
 {
        if(t!=type)
                require_buffer_type(t);
+       // Don't change the binding in a mesh's vertex array object
+       if(t==ELEMENT_ARRAY_BUFFER && Mesh::current())
+               throw invalid_operation("Buffer::bind_to(ELEMENT_ARRAY_BUFFER)");
        if(set_current(t, this))
                glBindBuffer(t, id);
 }
 
 void Buffer::unbind_from(BufferType type)
 {
+       if(type==ELEMENT_ARRAY_BUFFER && Mesh::current())
+               throw invalid_operation("Buffer::unbind_from(ELEMENT_ARRAY_BUFFER)");
        if(set_current(type, 0))
                glBindBuffer(type, 0);
 }
@@ -100,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;