Unbind things if they are deleted while current

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

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 9edcf07d6e52ab52e2b9b5f277a0f57b389fcec3..93ef98db60ad32654309945d505726d9255414d0 100644 (file)
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -13,6 +13,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 +27,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);
 }
 
@@ -140,6 +144,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);