Refactor VertexSetup format checking

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

diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp
index cda38b458fbb670bca4426d2c7060e4d7786d0f2..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(VertexAttribute a: fmt)
-               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(VertexAttribute a: fmt)
-               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