Tweak goal variable handling in ProgramBuilder

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

diff --git a/source/buffer.cpp b/source/buffer.cpp
index d8bb28028ee686380e48b77613c039906df40a35..9fa03c1242024184585618ff841b71d802fc1a46 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)
@@ -69,13 +65,26 @@ 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())
@@ -107,17 +116,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;