X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbuffer.cpp;fp=source%2Fcore%2Fbuffer.cpp;h=ecf7b49a15e35d29493c83f1a6ea2f8013065483;hb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318;hp=4750846ab1dceb291a600043977f1c06f868f403;hpb=a482029babea3210840d8c62e9df9ece4342b2b9;p=libs%2Fgl.git diff --git a/source/core/buffer.cpp b/source/core/buffer.cpp index 4750846a..ecf7b49a 100644 --- a/source/core/buffer.cpp +++ b/source/core/buffer.cpp @@ -15,9 +15,6 @@ using namespace std; namespace Msp { 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(): size(0), allocated(false) @@ -32,21 +29,9 @@ Buffer::Buffer(): Buffer::~Buffer() { - 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 Require _req_vbo(ARB_vertex_buffer_object); - if(type==PIXEL_PACK_BUFFER || type==PIXEL_UNPACK_BUFFER) - static Require _req_pbo(ARB_pixel_buffer_object); - else if(type==UNIFORM_BUFFER) - static Require _req_ubo(ARB_uniform_buffer_object); -} - void Buffer::storage(unsigned sz) { if(size>0) @@ -75,8 +60,9 @@ void Buffer::allocate() glNamedBufferStorage(id, size, 0, flags); else { - BindRestore _bind(this, ARRAY_BUFFER); - glBufferStorage(ARRAY_BUFFER, size, 0, flags); + glBindBuffer(GL_ARRAY_BUFFER, id); + glBufferStorage(GL_ARRAY_BUFFER, size, 0, flags); + glBindBuffer(GL_ARRAY_BUFFER, 0); } allocated = true; @@ -101,8 +87,9 @@ void Buffer::data(const void *d) glNamedBufferData(id, size, d, STATIC_DRAW); else { - BindRestore _bind(this, ARRAY_BUFFER); - glBufferData(ARRAY_BUFFER, size, d, STATIC_DRAW); + glBindBuffer(GL_ARRAY_BUFFER, id); + glBufferData(GL_ARRAY_BUFFER, size, d, STATIC_DRAW); + glBindBuffer(GL_ARRAY_BUFFER, 0); } allocated = true; @@ -129,8 +116,9 @@ void Buffer::sub_data(unsigned off, unsigned sz, const void *d) glNamedBufferSubData(id, off, sz, d); else { - BindRestore _bind(this, ARRAY_BUFFER); - glBufferSubData(ARRAY_BUFFER, off, sz, d); + glBindBuffer(GL_ARRAY_BUFFER, id); + glBufferSubData(GL_ARRAY_BUFFER, off, sz, d); + glBindBuffer(GL_ARRAY_BUFFER, 0); } } @@ -140,11 +128,6 @@ void Buffer::require_size(unsigned req_sz) const 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() { static Require _req(ARB_map_buffer_range); @@ -154,8 +137,10 @@ void *Buffer::map() return glMapNamedBufferRange(id, 0, size, GL_MAP_READ_BIT|GL_MAP_WRITE_BIT); else { - BindRestore _bind(this, ARRAY_BUFFER); - return glMapBufferRange(ARRAY_BUFFER, 0, size, GL_MAP_READ_BIT|GL_MAP_WRITE_BIT); + glBindBuffer(GL_ARRAY_BUFFER, id); + void *result = glMapBufferRange(GL_ARRAY_BUFFER, 0, size, GL_MAP_READ_BIT|GL_MAP_WRITE_BIT); + glBindBuffer(GL_ARRAY_BUFFER, 0); + return result; } } @@ -166,67 +151,15 @@ bool Buffer::unmap() return glUnmapNamedBuffer(id); else if(OES_mapbuffer) { - BindRestore _bind(this, ARRAY_BUFFER); - return glUnmapBuffer(ARRAY_BUFFER); + glBindBuffer(GL_ARRAY_BUFFER, id); + bool result = glUnmapBuffer(GL_ARRAY_BUFFER); + glBindBuffer(GL_ARRAY_BUFFER, 0); + return result; } else return true; } -void Buffer::bind_to(BufferType t) const -{ - require_buffer_type(t); - if(t==ELEMENT_ARRAY_BUFFER) - if(const VertexSetup *vs = VertexSetup::current()) - { - // 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)"); - } - if(set_current(t, this)) - glBindBuffer(t, id); -} - -const Buffer *Buffer::current(BufferType t) -{ - if(t==ELEMENT_ARRAY_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 && VertexSetup::current()) - throw invalid_operation("Buffer::unbind_from(ELEMENT_ARRAY_BUFFER)"); - if(set_current(type, 0)) - glBindBuffer(type, 0); -} - -const Buffer *&Buffer::binding(BufferType type) -{ - switch(type) - { - case ARRAY_BUFFER: return bound[0]; - 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"); - } -} - -bool Buffer::set_current(BufferType type, const Buffer *buf) -{ - const Buffer *&ptr = binding(type); - if(ptr==buf) - return false; - - ptr = buf; - return true; -} - void Buffer::set_debug_name(const string &name) { #ifdef DEBUG @@ -237,83 +170,5 @@ void Buffer::set_debug_name(const string &name) #endif } - -vector 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"); -} - -BufferRange::~BufferRange() -{ - for(unsigned i=0; i=Limits::get_global().max_uniform_bindings) - throw out_of_range("BufferRange::binding"); - if(bound_uniform.size()<=index) - bound_uniform.resize(index+1); - return bound_uniform[index]; - } - else - throw invalid_argument("BufferRange::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() -{ - return Limits::get_global().max_uniform_bindings; -} - -unsigned BufferRange::get_uniform_buffer_alignment() -{ - return Limits::get_global().uniform_buffer_alignment; -} - } // namespace GL } // namespace Msp