Clean up includes and forward declarations for the core classes

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

diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp
index 0971aed1c62f08c8c2823e873bcf86ce5ba15ba4..f73e288984fa815fd440cff68a3187ecb02e44d0 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"
 
@@ -137,9 +134,9 @@ 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;
@@ -150,14 +147,14 @@ void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding
        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);
        }