From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 18 Jun 2019 10:34:01 +0000 (+0300)
Subject: Use direct state access for updating VertexSetup
X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=commitdiff_plain;h=2b0aa5d0a22ce4ccca7d79ee15aa78f765b103cb

Use direct state access for updating VertexSetup
---

diff --git a/extensions/arb_vertex_attrib_binding.glext b/extensions/arb_vertex_attrib_binding.glext
new file mode 100644
index 00000000..25a084f5
--- /dev/null
+++ b/extensions/arb_vertex_attrib_binding.glext
@@ -0,0 +1 @@
+extension ARB_vertex_attrib_binding
diff --git a/source/vertexsetup.cpp b/source/vertexsetup.cpp
index 275585be..547dc096 100644
--- a/source/vertexsetup.cpp
+++ b/source/vertexsetup.cpp
@@ -1,4 +1,7 @@
+#include <msp/core/raii.h>
+#include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_vertex_array_object.h>
+#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 "buffer.h"
@@ -15,7 +18,10 @@ VertexSetup::VertexSetup():
 	index_buffer(0)
 {
 	static Require req(ARB_vertex_array_object);
-	glGenVertexArrays(1, &id);
+	if(ARB_direct_state_access)
+		glCreateVertexArrays(1, &id);
+	else
+		glGenVertexArrays(1, &id);
 }
 
 VertexSetup::~VertexSetup()
@@ -39,38 +45,59 @@ void VertexSetup::set_index_buffer(const Buffer &ibuf)
 
 void VertexSetup::update(unsigned mask) const
 {
-	if(current()!=this)
+	static bool direct = ARB_direct_state_access && ARB_vertex_attrib_binding;
+	if(!direct && current()!=this)
 	{
 		dirty |= mask;
 		return;
 	}
 
 	if(mask&VERTEX_ARRAY)
-		update_vertex_array();
+		update_vertex_array(direct);
 
 	if(mask&INDEX_BUFFER)
-		glBindBuffer(ELEMENT_ARRAY_BUFFER, index_buffer->get_id());
+	{
+		if(direct)
+			glVertexArrayElementBuffer(id, index_buffer->get_id());
+		else
+			glBindBuffer(ELEMENT_ARRAY_BUFFER, index_buffer->get_id());
+	}
 }
 
-void VertexSetup::update_vertex_array() const
+void VertexSetup::update_vertex_array(bool direct) const
 {
-	Bind bind_vbuf(array->get_buffer(), ARRAY_BUFFER);
+	Conditional<Bind> bind_vbuf(!direct, array->get_buffer(), ARRAY_BUFFER);
 
 	const VertexFormat &fmt = array->get_format();
 	unsigned stride = get_stride(fmt)*sizeof(float);
-	float *ptr = 0;
+	if(direct)
+		glVertexArrayVertexBuffer(id, 0, array->get_buffer()->get_id(), 0, stride);
+
+	unsigned offset = 0;
 	for(const unsigned char *c=fmt.begin(); c!=fmt.end(); ++c)
 	{
 		unsigned t = get_component_type(*c);
 		if(t>=get_component_type(ATTRIB1))
 			t -= get_component_type(ATTRIB1);
 		unsigned sz = get_component_size(*c);
-		if(*c==COLOR4_UBYTE)
-			glVertexAttribPointer(t, 4, GL_UNSIGNED_BYTE, true, stride, ptr);
+		if(direct)
+		{
+			if(*c==COLOR4_UBYTE)
+				glVertexArrayAttribFormat(id, t, 4, GL_UNSIGNED_BYTE, true, offset);
+			else
+				glVertexArrayAttribFormat(id, t, sz, GL_FLOAT, false, offset);
+			glVertexArrayAttribBinding(id, t, 0);
+			glEnableVertexArrayAttrib(id, t);
+		}
 		else
-			glVertexAttribPointer(t, sz, GL_FLOAT, false, stride, ptr);
-		glEnableVertexAttribArray(t);
-		ptr += sz;
+		{
+			if(*c==COLOR4_UBYTE)
+				glVertexAttribPointer(t, 4, GL_UNSIGNED_BYTE, true, stride, reinterpret_cast<unsigned char *>(offset));
+			else
+				glVertexAttribPointer(t, sz, GL_FLOAT, false, stride, reinterpret_cast<float *>(offset));
+			glEnableVertexAttribArray(t);
+		}
+		offset += sz*sizeof(float);
 	}
 }
 
diff --git a/source/vertexsetup.h b/source/vertexsetup.h
index c4cadfca..0155302c 100644
--- a/source/vertexsetup.h
+++ b/source/vertexsetup.h
@@ -37,7 +37,7 @@ public:
 
 private:
 	void update(unsigned) const;
-	void update_vertex_array() const;
+	void update_vertex_array(bool) const;
 
 public:
 	void bind() const;