#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"
#include "error.h"
#include "gl.h"
#include "misc.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)
VertexSetup::~VertexSetup()
{
- if(current()==this)
- unbind();
glDeleteVertexArrays(1, &id);
}
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;
}
throw invalid_argument("VertexSetup::set_vertex_array");
vertex_array = &a;
- update(VERTEX_ARRAY);
+ dirty |= VERTEX_ARRAY;
}
void VertexSetup::set_instance_array(const VertexArray &a)
static Require req(ARB_instanced_arrays);
inst_array = &a;
- update(INSTANCE_ARRAY);
+ dirty |= INSTANCE_ARRAY;
}
-void VertexSetup::set_index_buffer(const Buffer &ibuf)
+void VertexSetup::set_index_buffer(const Buffer &ibuf, DataType itype)
{
index_buffer = &ibuf;
- update(INDEX_BUFFER);
+ index_type = itype;
+ dirty |= INDEX_BUFFER;
}
bool VertexSetup::verify_format(const VertexFormat &fmt)
if(fmt.empty())
return false;
- static int max_attribs = -1;
- if(max_attribs<0)
- max_attribs = get_i(GL_MAX_VERTEX_ATTRIBS);
+ unsigned max_attribs = Limits::get_global().max_vertex_attributes;
- for(const unsigned char *a=fmt.begin(); a!=fmt.end(); ++a)
- if(static_cast<int>(get_attribute_semantic(*a))>=max_attribs)
+ for(const UInt16 *a=fmt.begin(); a!=fmt.end(); ++a)
+ if(get_attribute_semantic(*a)>=max_attribs)
return false;
return true;
}
-void VertexSetup::update(unsigned mask) const
+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);
+}
+
+void VertexSetup::update() const
{
static bool direct = ARB_direct_state_access && ARB_vertex_attrib_binding;
- if(!direct && current()!=this)
- {
- dirty |= mask;
- return;
- }
- if(mask&VERTEX_ARRAY)
+ if(dirty&VERTEX_ARRAY)
update_vertex_array(*vertex_array, 0, 0, direct);
- if((mask&INSTANCE_ARRAY) && inst_array)
+ if(dirty&INSTANCE_ARRAY)
update_vertex_array(*inst_array, 1, 1, direct);
- if(mask&INDEX_BUFFER)
+ if(dirty&INDEX_BUFFER)
{
if(direct)
glVertexArrayElementBuffer(id, index_buffer->get_id());
else
- glBindBuffer(ELEMENT_ARRAY_BUFFER, index_buffer->get_id());
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer->get_id());
}
+
+ dirty = 0;
}
void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding, unsigned divisor, bool direct) const
{
- Conditional<Bind> bind_vbuf(!direct, array.get_buffer(), ARRAY_BUFFER);
+ if(!direct)
+ 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(const UInt16 *a=fmt.begin(); a!=fmt.end(); ++a)
{
unsigned sem = get_attribute_semantic(*a);
- unsigned sz = get_attribute_size(*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);
}
-}
-void VertexSetup::bind() const
-{
- if(!vertex_array || !index_buffer)
- throw invalid_operation("VertexSetup::bind");
-
- if(set_current(this))
- {
- vertex_array->refresh();
- if(inst_array)
- inst_array->refresh();
- glBindVertexArray(id);
- if(dirty)
- {
- update(dirty);
- dirty = 0;
- }
- }
-}
-
-void VertexSetup::unbind()
-{
- if(set_current(0))
- glBindVertexArray(0);
+ if(!direct)
+ glBindBuffer(GL_ARRAY_BUFFER, 0);
}
void VertexSetup::unload()
}
else
{
- BindRestore _bind(*this);
- Buffer::unbind_from(ARRAY_BUFFER);
+ glBindVertexArray(id);
+ glBindBuffer(GL_ARRAY_BUFFER, 0);
- for(const unsigned char *a=vertex_format.begin(); a!=vertex_format.end(); ++a)
+ 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 unsigned char *a=inst_format.begin(); a!=inst_format.end(); ++a)
+ 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(ELEMENT_ARRAY_BUFFER, 0);
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
}
vertex_array = 0;
projects / libs / gl.git / blobdiff