#include <msp/gl/extensions/arb_vertex_attrib_binding.h>
#include <msp/gl/extensions/arb_vertex_buffer_object.h>
#include <msp/gl/extensions/arb_vertex_shader.h>
+#include <msp/gl/extensions/ext_gpu_shader4.h>
#include <msp/gl/extensions/khr_debug.h>
#include "buffer.h"
#include "deviceinfo.h"
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)
if(!vertex_format.empty())
throw invalid_operation("VertexSetup::set_format");
+ require_format(vfmt);
+
vertex_format = vfmt;
}
if(!vertex_format.empty())
throw invalid_operation("VertexSetup::set_format");
+ require_format(vfmt);
+ require_format(ifmt);
+
vertex_format = vfmt;
inst_format = ifmt;
}
dirty |= INSTANCE_ARRAY;
}
-void VertexSetup::set_index_buffer(const Buffer &ibuf)
+void VertexSetup::set_index_buffer(const Buffer &ibuf, DataType itype)
{
index_buffer = &ibuf;
+ index_type = itype;
dirty |= INDEX_BUFFER;
}
unsigned max_attribs = Limits::get_global().max_vertex_attributes;
- for(const unsigned char *a=fmt.begin(); a!=fmt.end(); ++a)
- if(get_attribute_semantic(*a)>=max_attribs)
+ for(VertexAttribute a: fmt)
+ if(get_attribute_semantic(a)>=max_attribs)
return false;
return true;
}
+void VertexSetup::require_format(const VertexFormat &fmt)
+{
+ bool has_int = false;
+ for(VertexAttribute a: fmt)
+ 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;
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()*sizeof(float);
+ unsigned stride = fmt.stride();
if(direct)
{
glVertexArrayVertexBuffer(id, binding, array.get_buffer()->get_id(), 0, stride);
}
unsigned offset = 0;
- for(const unsigned char *a=fmt.begin(); a!=fmt.end(); ++a)
+ for(VertexAttribute a: fmt)
{
- unsigned sem = get_attribute_semantic(*a);
- unsigned sz = get_attribute_size(*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(*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<unsigned char *>(offset));
+ if(integer)
+ glVertexAttribIPointer(sem, cc, type, stride, reinterpret_cast<void *>(offset));
else
- glVertexAttribPointer(sem, sz, GL_FLOAT, false, stride, reinterpret_cast<float *>(offset));
+ glVertexAttribPointer(sem, cc, type, true, stride, reinterpret_cast<void *>(offset));
if(ARB_instanced_arrays)
glVertexAttribDivisor(sem, divisor);
glEnableVertexAttribArray(sem);
}
- offset += sz*sizeof(float);
+ offset += get_attribute_size(a);
}
if(!direct)
glBindVertexArray(id);
glBindBuffer(GL_ARRAY_BUFFER, 0);
- for(const unsigned char *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 unsigned char *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);
}