X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fvertexsetup.cpp;h=81d2261e6aa78b55b3240e231ea72b25232bea60;hp=1094bb21c9ef229359a09f70b35435c32f6e8444;hb=e92de029768eef5f0fd744329e589161b46d0762;hpb=2d3113a7dbbe4be2f1d1e8980c1c4e42175163da diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp index 1094bb21..81d2261e 100644 --- a/source/core/vertexsetup.cpp +++ b/source/core/vertexsetup.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include "buffer.h" #include "deviceinfo.h" @@ -23,7 +24,8 @@ VertexSetup::VertexSetup(): dirty(0), vertex_array(0), inst_array(0), - index_buffer(0) + index_buffer(0), + index_type(UNSIGNED_SHORT) { static Require req(ARB_vertex_array_object); if(ARB_direct_state_access) @@ -34,8 +36,6 @@ VertexSetup::VertexSetup(): VertexSetup::~VertexSetup() { - if(current()==this) - unbind(); glDeleteVertexArrays(1, &id); } @@ -46,6 +46,8 @@ void VertexSetup::set_format(const VertexFormat &vfmt) if(!vertex_format.empty()) throw invalid_operation("VertexSetup::set_format"); + require_format(vfmt); + vertex_format = vfmt; } @@ -56,6 +58,9 @@ void VertexSetup::set_format_instanced(const VertexFormat &vfmt, const VertexFor if(!vertex_format.empty()) throw invalid_operation("VertexSetup::set_format"); + require_format(vfmt); + require_format(ifmt); + vertex_format = vfmt; inst_format = ifmt; } @@ -70,7 +75,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) @@ -85,13 +90,14 @@ void VertexSetup::set_instance_array(const VertexArray &a) 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) @@ -101,43 +107,51 @@ bool VertexSetup::verify_format(const VertexFormat &fmt) unsigned max_attribs = Limits::get_global().max_vertex_attributes; - for(const unsigned char *a=fmt.begin(); a!=fmt.end(); ++a) + for(const UInt16 *a=fmt.begin(); a!=fmt.end(); ++a) if(get_attribute_semantic(*a)>=max_attribs) return false; return true; } -void VertexSetup::update(unsigned mask) const +void VertexSetup::require_format(const VertexFormat &fmt) +{ + bool has_int = false; + for(const UInt16 *a=fmt.begin(); a!=fmt.end(); ++a) + has_int = has_int | is_integer_attribute(*a); + + if(has_int) + static Require _req(EXT_gpu_shader4); +} + +void VertexSetup::update() const { static bool direct = ARB_direct_state_access && ARB_vertex_attrib_binding; - if(!direct && current()!=this) - { - dirty |= mask; - return; - } - if(mask&VERTEX_ARRAY) + if(dirty&VERTEX_ARRAY) update_vertex_array(*vertex_array, 0, 0, direct); - if((mask&INSTANCE_ARRAY) && inst_array) + if(dirty&INSTANCE_ARRAY) update_vertex_array(*inst_array, 1, 1, direct); - if(mask&INDEX_BUFFER) + if(dirty&INDEX_BUFFER) { if(direct) glVertexArrayElementBuffer(id, index_buffer->get_id()); else - glBindBuffer(ELEMENT_ARRAY_BUFFER, index_buffer->get_id()); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer->get_id()); } + + dirty = 0; } void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding, unsigned divisor, bool direct) const { - Conditional bind_vbuf(!direct, array.get_buffer(), ARRAY_BUFFER); + if(!direct) + glBindBuffer(GL_ARRAY_BUFFER, array.get_buffer()->get_id()); const VertexFormat &fmt = array.get_format(); - unsigned stride = fmt.stride()*sizeof(float); + unsigned stride = fmt.stride(); if(direct) { glVertexArrayVertexBuffer(id, binding, array.get_buffer()->get_id(), 0, stride); @@ -145,56 +159,36 @@ void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding } unsigned offset = 0; - for(const unsigned char *a=fmt.begin(); a!=fmt.end(); ++a) + for(const UInt16 *a=fmt.begin(); a!=fmt.end(); ++a) { unsigned sem = get_attribute_semantic(*a); - unsigned sz = get_attribute_size(*a); + bool integer = is_integer_attribute(*a); + GLenum type = get_gl_type(get_attribute_source_type(*a)); + unsigned cc = get_attribute_component_count(*a); if(direct) { - if(*a==COLOR4_UBYTE) - glVertexArrayAttribFormat(id, sem, 4, GL_UNSIGNED_BYTE, true, offset); + if(integer) + glVertexArrayAttribIFormat(id, sem, cc, type, offset); else - glVertexArrayAttribFormat(id, sem, sz, GL_FLOAT, false, offset); + glVertexArrayAttribFormat(id, sem, cc, type, true, offset); glVertexArrayAttribBinding(id, sem, binding); glEnableVertexArrayAttrib(id, sem); } else { - if(*a==COLOR4_UBYTE) - glVertexAttribPointer(sem, 4, GL_UNSIGNED_BYTE, true, stride, reinterpret_cast(offset)); + if(integer) + glVertexAttribIPointer(sem, cc, type, stride, reinterpret_cast(offset)); else - glVertexAttribPointer(sem, sz, GL_FLOAT, false, stride, reinterpret_cast(offset)); + glVertexAttribPointer(sem, cc, type, true, stride, reinterpret_cast(offset)); if(ARB_instanced_arrays) glVertexAttribDivisor(sem, divisor); glEnableVertexAttribArray(sem); } - offset += sz*sizeof(float); + offset += get_attribute_size(*a); } -} -void VertexSetup::bind() const -{ - if(!vertex_array || !index_buffer) - throw invalid_operation("VertexSetup::bind"); - - if(set_current(this)) - { - vertex_array->refresh(); - if(inst_array) - inst_array->refresh(); - glBindVertexArray(id); - if(dirty) - { - update(dirty); - dirty = 0; - } - } -} - -void VertexSetup::unbind() -{ - if(set_current(0)) - glBindVertexArray(0); + if(!direct) + glBindBuffer(GL_ARRAY_BUFFER, 0); } void VertexSetup::unload() @@ -207,23 +201,23 @@ void VertexSetup::unload() } else { - BindRestore _bind(*this); - Buffer::unbind_from(ARRAY_BUFFER); + glBindVertexArray(id); + glBindBuffer(GL_ARRAY_BUFFER, 0); - for(const unsigned char *a=vertex_format.begin(); a!=vertex_format.end(); ++a) + for(const UInt16 *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) + for(const UInt16 *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); + glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); } vertex_array = 0;