-#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>
#include "buffer.h"
#include "deviceinfo.h"
#include "error.h"
-#include "gl.h"
-#include "misc.h"
#include "vertexarray.h"
#include "vertexsetup.h"
if(!vertex_format.empty())
throw invalid_operation("VertexSetup::set_format");
- require_format(vfmt);
+ require_format(vfmt, false);
vertex_format = vfmt;
}
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;
if(!a.get_buffer())
throw invalid_argument("VertexSetup::set_instance_array");
- static Require req(ARB_instanced_arrays);
-
inst_array = &a;
dirty |= INSTANCE_ARRAY;
}
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
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;
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);
}