X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuffer.cpp;h=91aa4028a1bc3d9279fffddc7912825762a03c36;hb=5f78db03b3285c977760a41da1e3927720e50352;hp=080c3fb380dc6dbf605e3a843b5ffb1e9a2851ba;hpb=00ffc97eda26687f98f04226c2da728e2ca1220e;p=libs%2Fgl.git diff --git a/source/buffer.cpp b/source/buffer.cpp index 080c3fb3..91aa4028 100644 --- a/source/buffer.cpp +++ b/source/buffer.cpp @@ -1,9 +1,11 @@ #include +#include #include +#include #include "buffer.h" #include "error.h" -#include "mesh.h" #include "misc.h" +#include "vertexsetup.h" using namespace std; @@ -20,7 +22,10 @@ Buffer::Buffer(BufferType t): { require_buffer_type(type); - glGenBuffers(1, &id); + if(ARB_direct_state_access) + glCreateBuffers(1, &id); + else + glGenBuffers(1, &id); } Buffer::~Buffer() @@ -42,20 +47,37 @@ void Buffer::require_buffer_type(BufferType type) 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) { - BindRestore _bind(this, type); - glBufferData(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; } 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(sizeget_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)"); } @@ -109,14 +148,14 @@ void Buffer::bind_to(BufferType t) const 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);