X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fvertexsetup.cpp;h=4fd589a9698bfe8a1616a4d097902a984e4f9c49;hb=9813f8711628a0fbe786406e974dc33546dc9cee;hp=1094bb21c9ef229359a09f70b35435c32f6e8444;hpb=2d3113a7dbbe4be2f1d1e8980c1c4e42175163da;p=libs%2Fgl.git diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp index 1094bb21..4fd589a9 100644 --- a/source/core/vertexsetup.cpp +++ b/source/core/vertexsetup.cpp @@ -1,16 +1,5 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include "buffer.h" #include "deviceinfo.h" #include "error.h" -#include "gl.h" -#include "misc.h" #include "vertexarray.h" #include "vertexsetup.h" @@ -23,21 +12,9 @@ VertexSetup::VertexSetup(): dirty(0), vertex_array(0), inst_array(0), - index_buffer(0) -{ - static Require req(ARB_vertex_array_object); - if(ARB_direct_state_access) - glCreateVertexArrays(1, &id); - else - glGenVertexArrays(1, &id); -} - -VertexSetup::~VertexSetup() -{ - if(current()==this) - unbind(); - glDeleteVertexArrays(1, &id); -} + index_buffer(0), + index_type(UNSIGNED_SHORT) +{ } void VertexSetup::set_format(const VertexFormat &vfmt) { @@ -46,6 +23,8 @@ void VertexSetup::set_format(const VertexFormat &vfmt) if(!vertex_format.empty()) throw invalid_operation("VertexSetup::set_format"); + require_format(vfmt, false); + vertex_format = vfmt; } @@ -56,6 +35,9 @@ void VertexSetup::set_format_instanced(const VertexFormat &vfmt, const VertexFor if(!vertex_format.empty()) throw invalid_operation("VertexSetup::set_format"); + require_format(vfmt, false); + require_format(ifmt, true); + vertex_format = vfmt; inst_format = ifmt; } @@ -70,7 +52,7 @@ void VertexSetup::set_vertex_array(const VertexArray &a) throw invalid_argument("VertexSetup::set_vertex_array"); vertex_array = &a; - update(VERTEX_ARRAY); + dirty |= VERTEX_ARRAY; } void VertexSetup::set_instance_array(const VertexArray &a) @@ -82,16 +64,15 @@ void VertexSetup::set_instance_array(const VertexArray &a) if(!a.get_buffer()) throw invalid_argument("VertexSetup::set_instance_array"); - static Require req(ARB_instanced_arrays); - inst_array = &a; - update(INSTANCE_ARRAY); + dirty |= INSTANCE_ARRAY; } -void VertexSetup::set_index_buffer(const Buffer &ibuf) +void VertexSetup::set_index_buffer(const Buffer &ibuf, DataType itype) { index_buffer = &ibuf; - update(INDEX_BUFFER); + index_type = itype; + dirty |= INDEX_BUFFER; } bool VertexSetup::verify_format(const VertexFormat &fmt) @@ -99,132 +80,19 @@ bool VertexSetup::verify_format(const VertexFormat &fmt) if(fmt.empty()) return false; - unsigned max_attribs = Limits::get_global().max_vertex_attributes; - - for(const unsigned char *a=fmt.begin(); a!=fmt.end(); ++a) - if(get_attribute_semantic(*a)>=max_attribs) - return false; - - return true; -} - -void VertexSetup::update(unsigned mask) const -{ - static bool direct = ARB_direct_state_access && ARB_vertex_attrib_binding; - if(!direct && current()!=this) - { - dirty |= mask; - return; - } - - if(mask&VERTEX_ARRAY) - update_vertex_array(*vertex_array, 0, 0, direct); - - if((mask&INSTANCE_ARRAY) && inst_array) - update_vertex_array(*inst_array, 1, 1, direct); - - if(mask&INDEX_BUFFER) - { - if(direct) - glVertexArrayElementBuffer(id, index_buffer->get_id()); - else - glBindBuffer(ELEMENT_ARRAY_BUFFER, index_buffer->get_id()); - } -} - -void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding, unsigned divisor, bool direct) const -{ - Conditional bind_vbuf(!direct, array.get_buffer(), ARRAY_BUFFER); - - const VertexFormat &fmt = array.get_format(); - unsigned stride = fmt.stride()*sizeof(float); - if(direct) - { - glVertexArrayVertexBuffer(id, binding, array.get_buffer()->get_id(), 0, stride); - glVertexArrayBindingDivisor(id, binding, divisor); - } - - unsigned offset = 0; - for(const unsigned char *a=fmt.begin(); a!=fmt.end(); ++a) - { - unsigned sem = get_attribute_semantic(*a); - unsigned sz = get_attribute_size(*a); - if(direct) - { - if(*a==COLOR4_UBYTE) - glVertexArrayAttribFormat(id, sem, 4, GL_UNSIGNED_BYTE, true, offset); - else - glVertexArrayAttribFormat(id, sem, sz, GL_FLOAT, false, offset); - glVertexArrayAttribBinding(id, sem, binding); - glEnableVertexArrayAttrib(id, sem); - } - else - { - if(*a==COLOR4_UBYTE) - glVertexAttribPointer(sem, 4, GL_UNSIGNED_BYTE, true, stride, reinterpret_cast(offset)); - else - glVertexAttribPointer(sem, sz, GL_FLOAT, false, stride, reinterpret_cast(offset)); - if(ARB_instanced_arrays) - glVertexAttribDivisor(sem, divisor); - glEnableVertexAttribArray(sem); - } - offset += sz*sizeof(float); - } + static unsigned max_attribs = DeviceInfo::get_global().limits.max_vertex_attributes; + return all_of(fmt.begin(), fmt.end(), [](VertexAttribute a){ return get_attribute_semantic(a)refresh(); - if(inst_array) - inst_array->refresh(); - glBindVertexArray(id); - if(dirty) - { - update(dirty); - dirty = 0; - } - } -} - -void VertexSetup::unbind() -{ - if(set_current(0)) - glBindVertexArray(0); + VertexSetupBackend::update(dirty); + dirty = 0; } void VertexSetup::unload() { - if(ARB_direct_state_access) - { - glVertexArrayVertexBuffer(id, 0, 0, 0, 0); - glVertexArrayVertexBuffer(id, 1, 0, 0, 0); - glVertexArrayElementBuffer(id, 0); - } - else - { - BindRestore _bind(*this); - Buffer::unbind_from(ARRAY_BUFFER); - - for(const unsigned char *a=vertex_format.begin(); a!=vertex_format.end(); ++a) - { - unsigned sem = get_attribute_semantic(*a); - glDisableVertexAttribArray(sem); - glVertexAttribPointer(sem, 1, GL_FLOAT, false, 0, 0); - } - for(const unsigned char *a=inst_format.begin(); a!=inst_format.end(); ++a) - { - unsigned sem = get_attribute_semantic(*a); - glDisableVertexAttribArray(sem); - glVertexAttribPointer(sem, 1, GL_FLOAT, false, 0, 0); - } - - glBindBuffer(ELEMENT_ARRAY_BUFFER, 0); - } + VertexSetupBackend::unload(); vertex_array = 0; vertex_format = VertexFormat(); @@ -233,15 +101,5 @@ void VertexSetup::unload() index_buffer = 0; } -void VertexSetup::set_debug_name(const string &name) -{ -#ifdef DEBUG - if(KHR_debug) - glObjectLabel(GL_VERTEX_ARRAY, id, name.size(), name.c_str()); -#else - (void)name; -#endif -} - } // namespace GL } // namespace Msp