Complete rewrite of extension handling

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

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 1762b20482eaa45944d94529b7c044aa25c898b5..84c72716d0e5da16cebb42fcd8e191c093ae1bd3 100644 (file)
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -1,14 +1,16 @@
 #include <stdexcept>
+#include "arb_pixel_buffer_object.h"
+#include "arb_uniform_buffer_object.h"
 #include "arb_vertex_buffer_object.h"
-#include "extension.h"
 #include "buffer.h"
+#include "misc.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-const Buffer *Buffer::bound[4] = { 0, 0, 0, 0 };
+const Buffer *Buffer::bound[5] = { 0, 0, 0, 0, 0 };
 
 Buffer::Buffer(BufferType t):
        type(t),
@@ -17,19 +19,21 @@ Buffer::Buffer(BufferType t):
 {
        require_buffer_type(type);
 
-       glGenBuffersARB(1, &id);
+       glGenBuffers(1, &id);
 }
 
 Buffer::~Buffer()
 {
-       glDeleteBuffersARB(1, &id);
+       glDeleteBuffers(1, &id);
 }
 
 void Buffer::require_buffer_type(BufferType type)
 {
-       static RequireExtension _req_vbo("GL_ARB_vertex_buffer_object");
+       static Require _req_vbo(ARB_vertex_buffer_object);
        if(type==PIXEL_PACK_BUFFER || type==PIXEL_UNPACK_BUFFER)
-               static RequireExtension _req_pbo("GL_ARB_pixel_buffer_object");
+               static Require _req_pbo(ARB_pixel_buffer_object);
+       else if(type==UNIFORM_BUFFER)
+               static Require _req_ubo(ARB_uniform_buffer_object);
 }
 
 void Buffer::set_usage(BufferUsage u)
@@ -41,7 +45,7 @@ void Buffer::data(unsigned sz, const void *d)
 {
        const Buffer *old = current(type);
        bind();
-       glBufferDataARB(type, sz, d, usage);
+       glBufferData(type, sz, d, usage);
        size = sz;
        restore(old, type);
 }
@@ -50,22 +54,27 @@ void Buffer::sub_data(unsigned off, unsigned sz, const void *d)
 {
        const Buffer *old = current(type);
        bind();
-       glBufferSubDataARB(type, off, sz, d);
+       glBufferSubData(type, off, sz, d);
        restore(old, type);
 }
 
+BufferRange *Buffer::create_range(unsigned s, unsigned o)
+{
+       return new BufferRange(*this, s, o);
+}
+
 void Buffer::bind_to(BufferType t) const
 {
        if(t!=type)
                require_buffer_type(t);
        if(set_current(t, this))
-               glBindBufferARB(t, id);
+               glBindBuffer(t, id);
 }
 
 void Buffer::unbind_from(BufferType type)
 {
        if(set_current(type, 0))
-               glBindBufferARB(type, 0);
+               glBindBuffer(type, 0);
 }
 
 const Buffer *&Buffer::binding(BufferType type)
@@ -76,6 +85,7 @@ const Buffer *&Buffer::binding(BufferType type)
        case ELEMENT_ARRAY_BUFFER: return bound[1];
        case PIXEL_PACK_BUFFER:    return bound[2];
        case PIXEL_UNPACK_BUFFER:  return bound[3];
+       case UNIFORM_BUFFER:       return bound[4];
        default: throw invalid_argument("Buffer::binding");
        }
 }
@@ -101,5 +111,76 @@ void Buffer::restore(const Buffer *buf, BufferType type)
        }
 }
 
+
+vector<const BufferRange *> BufferRange::bound_uniform;
+
+BufferRange::BufferRange(Buffer &b, unsigned o, unsigned s):
+       buffer(b),
+       offset(o),
+       size(s)
+{
+       if(o>buffer.get_size() || o+s>buffer.get_size())
+               throw out_of_range("BufferRange::BufferRange");
+}
+
+void BufferRange::data(const void *d)
+{
+       buffer.sub_data(offset, size, d);
+}
+
+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))
+               glBindBufferRange(t, i, buffer.id, offset, size);
+}
+
+void BufferRange::unbind_from(BufferType t, unsigned i)
+{
+       if(set_current(t, i, 0))
+       {
+               Buffer::set_current(t, 0);
+               glBindBufferBase(t, i, 0);
+       }
+}
+
+const BufferRange *&BufferRange::binding(BufferType type, unsigned index)
+{
+       if(type==UNIFORM_BUFFER)
+       {
+               if(index>=get_n_uniform_buffer_bindings())
+                       throw out_of_range("Buffer::binding");
+               if(bound_uniform.size()<=index)
+                       bound_uniform.resize(index+1);
+               return bound_uniform[index];
+       }
+       else
+               throw invalid_argument("Buffer::binding");
+}
+
+bool BufferRange::set_current(BufferType type, unsigned index, const BufferRange *buf)
+{
+       const BufferRange *&ptr = binding(type, index);
+       if(ptr==buf)
+               return false;
+
+       ptr = buf;
+       return true;
+}
+
+unsigned BufferRange::get_n_uniform_buffer_bindings()
+{
+       static unsigned count = get_i(GL_MAX_UNIFORM_BUFFER_BINDINGS);
+       return count;
+}
+
+unsigned BufferRange::get_uniform_buffer_alignment()
+{
+       static unsigned align = get_i(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT);
+       return align;
+}
+
 } // namespace GL
 } // namespace Msp