#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 <msp/gl/extensions/arb_buffer_storage.h>
+#include <msp/gl/extensions/arb_direct_state_access.h>
+#include <msp/gl/extensions/arb_map_buffer_range.h>
+#include <msp/strings/format.h>
#include "buffer.h"
#include "error.h"
-#include "mesh.h"
#include "misc.h"
+#include "vertexsetup.h"
using namespace std;
Buffer::Buffer(BufferType t):
type(t),
- usage(STATIC_DRAW),
size(0)
{
require_buffer_type(type);
- glGenBuffers(1, &id);
+ if(ARB_direct_state_access)
+ glCreateBuffers(1, &id);
+ else
+ glGenBuffers(1, &id);
}
Buffer::~Buffer()
static Require _req_ubo(ARB_uniform_buffer_object);
}
-void Buffer::set_usage(BufferUsage u)
+void Buffer::storage(unsigned sz)
+{
+ if(size>0)
+ throw invalid_operation("Buffer::storage");
+ if(sz==0)
+ throw invalid_argument("Buffer::storage");
+
+ size = sz;
+ if(ARB_buffer_storage)
+ {
+ static const int flags = GL_MAP_READ_BIT|GL_MAP_WRITE_BIT|GL_DYNAMIC_STORAGE_BIT;
+ if(ARB_direct_state_access)
+ glNamedBufferStorage(id, size, 0, flags);
+ else
+ {
+ BindRestore _bind(this, type);
+ glBufferStorage(type, size, 0, flags);
+ }
+ }
+}
+
+void Buffer::set_usage(BufferUsage)
{
- usage = u;
+}
+
+void Buffer::data(const void *d)
+{
+ if(size==0)
+ throw invalid_operation("Buffer::data");
+
+ if(ARB_buffer_storage)
+ return sub_data(0, size, d);
+
+ if(ARB_direct_state_access)
+ glNamedBufferData(id, size, d, STATIC_DRAW);
+ else
+ {
+ BindRestore _bind(this, type);
+ glBufferData(type, size, d, STATIC_DRAW);
+ }
}
void Buffer::data(unsigned sz, const void *d)
{
- BindRestore _bind(this, type);
- glBufferData(type, sz, d, usage);
- size = sz;
+ if(size==0)
+ storage(sz);
+ else if(sz!=size)
+ throw incompatible_data("Buffer::data");
+
+ data(d);
}
void Buffer::sub_data(unsigned off, unsigned sz, const void *d)
{
- BindRestore _bind(this, type);
- glBufferSubData(type, off, sz, d);
+ if(ARB_direct_state_access)
+ glNamedBufferSubData(id, off, sz, d);
+ else
+ {
+ BindRestore _bind(this, type);
+ glBufferSubData(type, off, sz, d);
+ }
+}
+
+void Buffer::require_size(unsigned req_sz) const
+{
+ if(size<req_sz)
+ throw buffer_too_small(format("buffer has %d bytes; %d required", size, req_sz));
}
BufferRange *Buffer::create_range(unsigned s, unsigned o)
return new BufferRange(*this, s, o);
}
-void *Buffer::map(BufferAccess access)
+void *Buffer::map()
{
- BindRestore _bind(this, type);
- return glMapBuffer(type, access);
+ if(ARB_map_buffer_range)
+ {
+ if(ARB_direct_state_access)
+ return glMapNamedBufferRange(id, 0, size, GL_MAP_READ_BIT|GL_MAP_WRITE_BIT);
+ else
+ {
+ BindRestore _bind(this, type);
+ return glMapBufferRange(type, 0, size, GL_MAP_READ_BIT|GL_MAP_WRITE_BIT);
+ }
+ }
+ else if(ARB_direct_state_access)
+ return glMapNamedBuffer(id, GL_READ_WRITE);
+ else if(OES_mapbuffer)
+ {
+ BindRestore _bind(this, type);
+ return glMapBuffer(type, GL_READ_WRITE);
+ }
+ else
+ throw invalid_operation("Buffer::map");
}
bool Buffer::unmap()
{
- BindRestore _bind(this, type);
- return glUnmapBuffer(type);
+ // TODO check if it's mapped
+ if(ARB_direct_state_access)
+ return glUnmapNamedBuffer(id);
+ else if(OES_mapbuffer)
+ {
+ BindRestore _bind(this, type);
+ return glUnmapBuffer(type);
+ }
+ else
+ return true;
}
void Buffer::bind_to(BufferType t) const
if(t!=type)
require_buffer_type(t);
if(t==ELEMENT_ARRAY_BUFFER)
- if(const Mesh *m = Mesh::current())
+ if(const VertexSetup *vs = VertexSetup::current())
{
- // Don't change the binding in a mesh's vertex array object
- if(this==m->get_index_buffer())
+ // Don't change the binding in a vertex array object
+ if(this==vs->get_index_buffer())
return;
throw invalid_operation("Buffer::bind_to(ELEMENT_ARRAY_BUFFER)");
}
const Buffer *Buffer::current(BufferType t)
{
if(t==ELEMENT_ARRAY_BUFFER)
- if(const Mesh *m = Mesh::current())
- return m->get_index_buffer();
+ if(const VertexSetup *vs = VertexSetup::current())
+ return vs->get_index_buffer();
return binding(t);
}
void Buffer::unbind_from(BufferType type)
{
- if(type==ELEMENT_ARRAY_BUFFER && Mesh::current())
+ if(type==ELEMENT_ARRAY_BUFFER && VertexSetup::current())
throw invalid_operation("Buffer::unbind_from(ELEMENT_ARRAY_BUFFER)");
if(set_current(type, 0))
glBindBuffer(type, 0);
{
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)