X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fvertexsetup.cpp;h=61bf032c0fcaecae0ffac46fef15c95f86e95952;hp=7a24da7350b5f332a1e2aaaaa5c80a29fc7646e8;hb=d16d28d2ccf7c6255204f02975834f713ff1df08;hpb=7b569bbfcfb65d8d88b47ac42ee1df6a7d27e784 diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp index 7a24da73..61bf032c 100644 --- a/source/core/vertexsetup.cpp +++ b/source/core/vertexsetup.cpp @@ -1,17 +1,5 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "buffer.h" -#include "deviceinfo.h" +#include "device.h" #include "error.h" -#include "gl.h" -#include "misc.h" #include "vertexarray.h" #include "vertexsetup.h" @@ -20,25 +8,6 @@ using namespace std; namespace Msp { namespace GL { -VertexSetup::VertexSetup(): - dirty(0), - vertex_array(0), - inst_array(0), - index_buffer(0), - index_type(UNSIGNED_SHORT) -{ - static Require req(ARB_vertex_array_object); - if(ARB_direct_state_access) - glCreateVertexArrays(1, &id); - else - glGenVertexArrays(1, &id); -} - -VertexSetup::~VertexSetup() -{ - glDeleteVertexArrays(1, &id); -} - void VertexSetup::set_format(const VertexFormat &vfmt) { if(!verify_format(vfmt)) @@ -46,7 +15,7 @@ void VertexSetup::set_format(const VertexFormat &vfmt) if(!vertex_format.empty()) throw invalid_operation("VertexSetup::set_format"); - require_format(vfmt); + require_format(vfmt, false); vertex_format = vfmt; } @@ -54,12 +23,12 @@ void VertexSetup::set_format(const VertexFormat &vfmt) void VertexSetup::set_format_instanced(const VertexFormat &vfmt, const VertexFormat &ifmt) { if(!verify_format(vfmt) || !verify_format(ifmt)) - throw invalid_argument("VertexSetup::set_format"); + throw invalid_argument("VertexSetup::set_format_instanced"); if(!vertex_format.empty()) - throw invalid_operation("VertexSetup::set_format"); + throw invalid_operation("VertexSetup::set_format_instanced"); - require_format(vfmt); - require_format(ifmt); + require_format(vfmt, false); + require_format(ifmt, true); vertex_format = vfmt; inst_format = ifmt; @@ -87,8 +56,6 @@ 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; dirty |= INSTANCE_ARRAY; } @@ -105,123 +72,19 @@ bool VertexSetup::verify_format(const VertexFormat &fmt) if(fmt.empty()) return false; - unsigned max_attribs = Limits::get_global().max_vertex_attributes; - - for(const UInt16 *a=fmt.begin(); a!=fmt.end(); ++a) - if(get_attribute_semantic(*a)>=max_attribs) - return false; - - return true; -} - -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); + static unsigned max_attribs = Device::get_current().get_info().limits.max_vertex_attributes; + return all_of(fmt.begin(), fmt.end(), [](VertexAttribute a){ return get_attribute_semantic(a)get_id()); - else - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer->get_id()); - } - + VertexSetupBackend::update(dirty); dirty = 0; } -void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding, unsigned divisor, bool direct) const -{ - if(!direct) - { - Buffer::unbind_scratch(); - glBindBuffer(GL_ARRAY_BUFFER, array.get_buffer()->get_id()); - } - - const VertexFormat &fmt = array.get_format(); - unsigned stride = fmt.stride(); - if(direct) - { - glVertexArrayVertexBuffer(id, binding, array.get_buffer()->get_id(), 0, stride); - glVertexArrayBindingDivisor(id, binding, divisor); - } - - unsigned offset = 0; - for(const UInt16 *a=fmt.begin(); a!=fmt.end(); ++a) - { - unsigned sem = get_attribute_semantic(*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(integer) - glVertexArrayAttribIFormat(id, sem, cc, type, offset); - else - glVertexArrayAttribFormat(id, sem, cc, type, true, offset); - glVertexArrayAttribBinding(id, sem, binding); - glEnableVertexArrayAttrib(id, sem); - } - else - { - if(integer) - glVertexAttribIPointer(sem, cc, type, stride, reinterpret_cast(offset)); - else - glVertexAttribPointer(sem, cc, type, true, stride, reinterpret_cast(offset)); - if(ARB_instanced_arrays) - glVertexAttribDivisor(sem, divisor); - glEnableVertexAttribArray(sem); - } - offset += get_attribute_size(*a); - } - - if(!direct) - glBindBuffer(GL_ARRAY_BUFFER, 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 - { - glBindVertexArray(id); - glBindBuffer(GL_ARRAY_BUFFER, 0); - - 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 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(GL_ELEMENT_ARRAY_BUFFER, 0); - } + VertexSetupBackend::unload(); vertex_array = 0; vertex_format = VertexFormat(); @@ -230,15 +93,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