#include <stdexcept>
-#include "arb_uniform_buffer_object.h"
-#include "arb_vertex_buffer_object.h"
+#include <msp/gl/extensions/arb_direct_state_access.h>
+#include <msp/gl/extensions/arb_map_buffer_range.h>
#include "buffer.h"
-#include "extension.h"
+#include "error.h"
+#include "mesh.h"
#include "misc.h"
using namespace std;
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),
{
require_buffer_type(type);
- glGenBuffersARB(1, &id);
+ if(ARB_direct_state_access)
+ glCreateBuffers(1, &id);
+ else
+ glGenBuffers(1, &id);
}
Buffer::~Buffer()
{
- glDeleteBuffersARB(1, &id);
+ for(unsigned i=0; i<5; ++i)
+ if(bound[i]==this)
+ unbind_from(buffer_types[i]);
+ 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 RequireExtension _req_ubo("GL_ARB_uniform_buffer_object");
+ static Require _req_ubo(ARB_uniform_buffer_object);
}
void Buffer::set_usage(BufferUsage u)
{
+ // TODO OpenGL ES 2.0 doesn't support read or copy usages
usage = u;
}
void Buffer::data(unsigned sz, const void *d)
{
- const Buffer *old = current(type);
- bind();
- glBufferDataARB(type, sz, d, usage);
+ if(ARB_direct_state_access)
+ glNamedBufferData(id, sz, d, usage);
+ else
+ {
+ 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();
- glBufferSubDataARB(type, off, sz, d);
- restore(old, type);
+ if(ARB_direct_state_access)
+ glNamedBufferSubData(id, off, sz, d);
+ else
+ {
+ BindRestore _bind(this, type);
+ glBufferSubData(type, off, sz, d);
+ }
}
BufferRange *Buffer::create_range(unsigned s, unsigned o)
return new BufferRange(*this, s, o);
}
+void *Buffer::map(BufferAccess access)
+{
+ if(ARB_map_buffer_range)
+ {
+ GLenum access_bits = 0;
+ if(access==READ_ONLY)
+ access_bits = GL_MAP_READ_BIT;
+ else if(access==WRITE_ONLY)
+ access_bits = GL_MAP_WRITE_BIT;
+ else if(access==READ_WRITE)
+ access_bits = GL_MAP_READ_BIT|GL_MAP_WRITE_BIT;
+ if(ARB_direct_state_access)
+ return glMapNamedBufferRange(id, 0, size, access_bits);
+ else
+ {
+ BindRestore _bind(this, type);
+ return glMapBufferRange(type, 0, size, access_bits);
+ }
+ }
+ else if(ARB_direct_state_access)
+ return glMapNamedBuffer(id, access);
+ else if(OES_mapbuffer)
+ {
+ BindRestore _bind(this, type);
+ return glMapBuffer(type, access);
+ }
+ else
+ throw invalid_operation("Buffer::map");
+}
+
+bool Buffer::unmap()
+{
+ // 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())
+ {
+ // 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))
- glBindBufferARB(t, id);
+ 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())
+ throw invalid_operation("Buffer::unbind_from(ELEMENT_ARRAY_BUFFER)");
if(set_current(type, 0))
- glBindBufferARB(type, 0);
+ glBindBuffer(type, 0);
}
const Buffer *&Buffer::binding(BufferType type)
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;
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);
{
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)
if(type==UNIFORM_BUFFER)
{
if(index>=get_n_uniform_buffer_bindings())
- throw out_of_range("Buffer::binding");
+ throw out_of_range("BufferRange::binding");
if(bound_uniform.size()<=index)
bound_uniform.resize(index+1);
return bound_uniform[index];
}
else
- throw invalid_argument("Buffer::binding");
+ throw invalid_argument("BufferRange::binding");
}
bool BufferRange::set_current(BufferType type, unsigned index, const BufferRange *buf)
return count;
}
+unsigned BufferRange::get_uniform_buffer_alignment()
+{
+ static unsigned align = get_i(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT);
+ return align;
+}
+
} // namespace GL
} // namespace Msp
projects / libs / gl.git / blobdiff