Replace use of VertexArrayObject with glVertexArray/glBuffer DSA versions

4 files changed, 12 insertions, 14 deletions

diff --git a/gfx/gl/sceneRenderer.cpp b/gfx/gl/sceneRenderer.cpp
index 15dde1b..e67711b 100644
--- a/gfx/gl/sceneRenderer.cpp
+++ b/gfx/gl/sceneRenderer.cpp
@@ -1,6 +1,5 @@
 #include "sceneRenderer.h"
 #include "maths.h"
-#include "vertexArrayObject.h"
 #include <gfx/gl/shaders/directionalLight-frag.h>
 #include <gfx/gl/shaders/lighting-frag.h>
 #include <gfx/gl/shaders/lighting-vert.h>
@@ -22,7 +21,7 @@ SceneRenderer::SceneRenderer(ScreenAbsCoord s, GLuint o, glDebugScope) :
 	lighting {lighting_vert, lighting_frag}, shadowMapper {{2048, 2048}}
 {
 	shader.setViewPort({0, 0, size.x, size.y});
-	VertexArrayObject {displayVAO}.addAttribs<glm::i8vec4>(displayVBO, displayVAOdata);
+	displayVAO.configure().addAttribs<glm::i8vec4>(0, displayVBO, displayVAOdata);
 
 	const auto configuregdata = [this](const auto & data, const std::initializer_list<GLint> iformats,
 										const GLenum format, const GLenum attachment) {
diff --git a/gfx/gl/sceneShader.cpp b/gfx/gl/sceneShader.cpp
index 43e54a5..302edda 100644
--- a/gfx/gl/sceneShader.cpp
+++ b/gfx/gl/sceneShader.cpp
@@ -22,7 +22,7 @@
 #include <gfx/gl/shaders/spotLight-vert.h>
 #include <gfx/gl/shaders/water-frag.h>
 #include <gfx/gl/shaders/water-vert.h>
-#include <gfx/gl/vertexArrayObject.h>
+#include <gl_traits.h>
 #include <glm/gtc/type_ptr.hpp>
 #include <glm/gtx/transform.hpp>
 #include <location.h>
diff --git a/gfx/models/mesh.h b/gfx/models/mesh.h
index 4135a30..e78d27e 100644
--- a/gfx/models/mesh.h
+++ b/gfx/models/mesh.h
@@ -2,7 +2,6 @@
 
 #include "config/types.h"
 #include "gfx/gl/glBuffer.h"
-#include "gfx/gl/vertexArrayObject.h"
 #include <gfx/gl/glVertexArray.h>
 #include <glad/gl.h>
 #include <ranges>
@@ -54,15 +53,15 @@ public:
 					return static_cast<RelativePosition3D>(v.pos);
 				}))}
 	{
-		VertexArrayObject::data(vertices, m_vertexArrayBuffers[0], GL_ARRAY_BUFFER);
-		VertexArrayObject::data(indices, m_vertexArrayBuffers[1], GL_ARRAY_BUFFER);
-		configureVAO(m_vertexArrayObject);
+		m_vertexArrayBuffers[0].storage(vertices, 0);
+		m_vertexArrayBuffers[1].storage(indices, 0);
+		configureVAO(m_vertexArrayObject, 0);
 	}
 
-	VertexArrayObject &
-	configureVAO(VertexArrayObject && vao) const
+	auto
+	configureVAO(glVertexArray & vao, GLuint divisor) const
 	{
-		return vao.addAttribsFor<V>(m_vertexArrayBuffers[0]).addIndices(m_vertexArrayBuffers[1]);
+		return vao.configure().addAttribsFor<V>(divisor, m_vertexArrayBuffers[0]).addIndices(m_vertexArrayBuffers[1]);
 	}
 };
 
diff --git a/gfx/models/vertex.cpp b/gfx/models/vertex.cpp
index c144db3..dc32f72 100644
--- a/gfx/models/vertex.cpp
+++ b/gfx/models/vertex.cpp
@@ -1,10 +1,10 @@
 #include "vertex.h"
-#include "gfx/gl/vertexArrayObject.h"
+#include "gfx/gl/glVertexArray.h"
 
 template<>
-VertexArrayObject &
-VertexArrayObject::addAttribsFor<Vertex>(const GLuint arrayBuffer, const GLuint divisor)
+Impl::VertexArrayConfigurator &
+Impl::VertexArrayConfigurator::addAttribsFor<Vertex>(const GLuint divisor, const glBuffer & buffer)
 {
 	return addAttribs<Vertex, &Vertex::pos, &Vertex::texCoord, &Vertex::normal, &Vertex::colour, &Vertex::material>(
-			arrayBuffer, divisor);
+			divisor, buffer);
 }