-#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(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);
}