Refactor VertexSetup format checking

[libs/gl.git] / source / core / vertexsetup.cpp

diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp
index 75d3ad8bc11017966d249adbe4762e2b235cab0f..892cec86f2d8df5c6825b4ca07f9a6266b8e5e5c 100644 (file)
--- a/source/core/vertexsetup.cpp
+++ b/source/core/vertexsetup.cpp
@@ -1,4 +1,3 @@
-#include <msp/core/raii.h>
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_instanced_arrays.h>
 #include <msp/gl/extensions/arb_vertex_array_object.h>
@@ -10,8 +9,6 @@
 #include "buffer.h"
 #include "deviceinfo.h"
 #include "error.h"
-#include "gl.h"
-#include "misc.h"
 #include "vertexarray.h"
 #include "vertexsetup.h"
 
@@ -46,7 +43,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;
 }
@@ -58,8 +55,8 @@ 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);
+       require_format(vfmt, false);
+       require_format(ifmt, true);
 
        vertex_format = vfmt;
        inst_format = ifmt;
@@ -87,8 +84,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,23 +100,16 @@ bool VertexSetup::verify_format(const VertexFormat &fmt)
        if(fmt.empty())
                return false;
 
-       unsigned max_attribs = Limits::get_global().max_vertex_attributes;
-
-       for(const uint16_t *a=fmt.begin(); a!=fmt.end(); ++a)
-               if(get_attribute_semantic(*a)>=max_attribs)
-                       return false;
-
-       return true;
+       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)<max_attribs; });
 }
 
-void VertexSetup::require_format(const VertexFormat &fmt)
+void VertexSetup::require_format(const VertexFormat &fmt, bool instanced)
 {
-       bool has_int = false;
-       for(const uint16_t *a=fmt.begin(); a!=fmt.end(); ++a)
-               has_int = has_int | is_integer_attribute(*a);
-
-       if(has_int)
+       if(any_of(fmt.begin(), fmt.end(), is_integer_attribute))
                static Require _req(EXT_gpu_shader4);
+       if(instanced)
+               static Require req(ARB_instanced_arrays);
 }
 
 void VertexSetup::update() const
@@ -137,9 +125,9 @@ void VertexSetup::update() const
        if(dirty&INDEX_BUFFER)
        {
                if(direct)
-                       glVertexArrayElementBuffer(id, index_buffer->get_id());
+                       glVertexArrayElementBuffer(id, index_buffer->id);
                else
-                       glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer->get_id());
+                       glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer->id);
        }
 
        dirty = 0;
@@ -150,24 +138,24 @@ void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding
        if(!direct)
        {
                Buffer::unbind_scratch();
-               glBindBuffer(GL_ARRAY_BUFFER, array.get_buffer()->get_id());
+               glBindBuffer(GL_ARRAY_BUFFER, array.get_buffer()->id);
        }
 
        const VertexFormat &fmt = array.get_format();
        unsigned stride = fmt.stride();
        if(direct)
        {
-               glVertexArrayVertexBuffer(id, binding, array.get_buffer()->get_id(), 0, stride);
+               glVertexArrayVertexBuffer(id, binding, array.get_buffer()->id, 0, stride);
                glVertexArrayBindingDivisor(id, binding, divisor);
        }
 
        unsigned offset = 0;
-       for(const uint16_t *a=fmt.begin(); a!=fmt.end(); ++a)
+       for(VertexAttribute a: fmt)
        {
-               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);
+               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)
@@ -187,7 +175,7 @@ void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding
                                glVertexAttribDivisor(sem, divisor);
                        glEnableVertexAttribArray(sem);
                }
-               offset += get_attribute_size(*a);
+               offset += get_attribute_size(a);
        }
 
        if(!direct)
@@ -207,15 +195,15 @@ void VertexSetup::unload()
                glBindVertexArray(id);
                glBindBuffer(GL_ARRAY_BUFFER, 0);
 
-               for(const uint16_t *a=vertex_format.begin(); a!=vertex_format.end(); ++a)
+               for(VertexAttribute a: vertex_format)
                {
-                       unsigned sem = get_attribute_semantic(*a);
+                       unsigned sem = get_attribute_semantic(a);
                        glDisableVertexAttribArray(sem);
                        glVertexAttribPointer(sem, 1, GL_FLOAT, false, 0, 0);
                }
-               for(const uint16_t *a=inst_format.begin(); a!=inst_format.end(); ++a)
+               for(VertexAttribute a: inst_format)
                {
-                       unsigned sem = get_attribute_semantic(*a);
+                       unsigned sem = get_attribute_semantic(a);
                        glDisableVertexAttribArray(sem);
                        glVertexAttribPointer(sem, 1, GL_FLOAT, false, 0, 0);
                }