Run a tighter ship with extensions

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

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 61670cf9d378245f9a96ddead7f0fcea32ffb584..1226dbe3223f41e438ddcc7ca1c2f9b107b0fd17 100644 (file)
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -1,7 +1,4 @@
 #include <stdexcept>
-#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"
@@ -13,6 +10,7 @@ namespace Msp {
 namespace GL {
 
 const Buffer *Buffer::bound[5] = { 0, 0, 0, 0, 0 };
+BufferType buffer_types[] = { ARRAY_BUFFER, ELEMENT_ARRAY_BUFFER, PIXEL_PACK_BUFFER, PIXEL_UNPACK_BUFFER, UNIFORM_BUFFER };
 
 Buffer::Buffer(BufferType t):
        type(t),
@@ -26,6 +24,9 @@ Buffer::Buffer(BufferType t):
 
 Buffer::~Buffer()
 {
+       for(unsigned i=0; i<5; ++i)
+               if(bound[i]==this)
+                       unbind_from(buffer_types[i]);
        glDeleteBuffers(1, &id);
 }
 
@@ -61,17 +62,42 @@ BufferRange *Buffer::create_range(unsigned s, unsigned o)
        return new BufferRange(*this, s, o);
 }
 
+void *Buffer::map(BufferAccess access)
+{
+       BindRestore _bind(this, type);
+       return glMapBuffer(type, access);
+}
+
+bool Buffer::unmap()
+{
+       BindRestore _bind(this, type);
+       return glUnmapBuffer(type);
+}
+
 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(t==ELEMENT_ARRAY_BUFFER)
+               if(const Mesh *m = Mesh::current())
+               {
+                       // Don't change the binding in a mesh's vertex array object
+                       if(this==m->get_index_buffer())
+                               return;
+                       throw invalid_operation("Buffer::bind_to(ELEMENT_ARRAY_BUFFER)");
+               }
        if(set_current(t, this))
                glBindBuffer(t, id);
 }
 
+const Buffer *Buffer::current(BufferType t)
+{
+       if(t==ELEMENT_ARRAY_BUFFER)
+               if(const Mesh *m = Mesh::current())
+                       return m->get_index_buffer();
+       return binding(t);
+}
+
 void Buffer::unbind_from(BufferType type)
 {
        if(type==ELEMENT_ARRAY_BUFFER && Mesh::current())
@@ -115,6 +141,13 @@ BufferRange::BufferRange(Buffer &b, unsigned o, unsigned s):
                throw out_of_range("BufferRange::BufferRange");
 }
 
+BufferRange::~BufferRange()
+{
+       for(unsigned i=0; i<bound_uniform.size(); ++i)
+               if(bound_uniform[i]==this)
+                       unbind_from(UNIFORM_BUFFER, i);
+}
+
 void BufferRange::data(const void *d)
 {
        buffer.sub_data(offset, size, d);
@@ -124,9 +157,12 @@ void BufferRange::bind_to(BufferType t, unsigned i)
 {
        if(t!=buffer.type)
                Buffer::require_buffer_type(t);
-       // Intentionally using bitwise | to avoid short-circuiting
-       if(Buffer::set_current(t, &buffer) | set_current(t, i, this))
+       if(set_current(t, i, this))
+       {
+               // The buffer gets bound as a side effect
+               Buffer::set_current(t, &buffer);
                glBindBufferRange(t, i, buffer.id, offset, size);
+       }
 }
 
 void BufferRange::unbind_from(BufferType t, unsigned i)