X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fvertexsetup.cpp;h=2994916e81e0503c29110d55882f60cccf258ea1;hp=892cec86f2d8df5c6825b4ca07f9a6266b8e5e5c;hb=HEAD;hpb=526960705d8108dcc46dbb71d0d00d680b0b1bb3

diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp
index 892cec86..2994916e 100644
--- a/source/core/vertexsetup.cpp
+++ b/source/core/vertexsetup.cpp
@@ -1,13 +1,4 @@
-#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 <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 "device.h"
 #include "error.h"
 #include "vertexarray.h"
 #include "vertexsetup.h"
@@ -17,25 +8,6 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-VertexSetup::VertexSetup():
-	dirty(0),
-	vertex_array(0),
-	inst_array(0),
-	index_buffer(0),
-	index_type(UNSIGNED_SHORT)
-{
-	static Require req(ARB_vertex_array_object);
-	if(ARB_direct_state_access)
-		glCreateVertexArrays(1, &id);
-	else
-		glGenVertexArrays(1, &id);
-}
-
-VertexSetup::~VertexSetup()
-{
-	glDeleteVertexArrays(1, &id);
-}
-
 void VertexSetup::set_format(const VertexFormat &vfmt)
 {
 	if(!verify_format(vfmt))
@@ -51,9 +23,9 @@ void VertexSetup::set_format(const VertexFormat &vfmt)
 void VertexSetup::set_format_instanced(const VertexFormat &vfmt, const VertexFormat &ifmt)
 {
 	if(!verify_format(vfmt) || !verify_format(ifmt))
-		throw invalid_argument("VertexSetup::set_format");
+		throw invalid_argument("VertexSetup::set_format_instanced");
 	if(!vertex_format.empty())
-		throw invalid_operation("VertexSetup::set_format");
+		throw invalid_operation("VertexSetup::set_format_instanced");
 
 	require_format(vfmt, false);
 	require_format(ifmt, true);
@@ -100,116 +72,19 @@ bool VertexSetup::verify_format(const VertexFormat &fmt)
 	if(fmt.empty())
 		return false;
 
-	static unsigned max_attribs = DeviceInfo::get_global().limits.max_vertex_attributes;
-	return all_of(fmt.begin(), fmt.end(), [](VertexAttribute a){ return get_attribute_semantic(a)<max_attribs; });
-}
-
-void VertexSetup::require_format(const VertexFormat &fmt, bool instanced)
-{
-	if(any_of(fmt.begin(), fmt.end(), is_integer_attribute))
-		static Require _req(EXT_gpu_shader4);
-	if(instanced)
-		static Require req(ARB_instanced_arrays);
+	static unsigned max_attribs = Device::get_current().get_info().limits.max_vertex_attributes;
+	return all_of(fmt.begin(), fmt.end(), [](VertexAttribute a){ return is_padding(a) || get_attribute_semantic(a)<max_attribs; });
 }
 
 void VertexSetup::update() const
 {
-	static bool direct = ARB_direct_state_access && ARB_vertex_attrib_binding;
-
-	if(dirty&VERTEX_ARRAY)
-		update_vertex_array(*vertex_array, 0, 0, direct);
-
-	if(dirty&INSTANCE_ARRAY)
-		update_vertex_array(*inst_array, 1, 1, direct);
-
-	if(dirty&INDEX_BUFFER)
-	{
-		if(direct)
-			glVertexArrayElementBuffer(id, index_buffer->id);
-		else
-			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer->id);
-	}
-
+	VertexSetupBackend::update(dirty);
 	dirty = 0;
 }
 
-void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding, unsigned divisor, bool direct) const
-{
-	if(!direct)
-	{
-		Buffer::unbind_scratch();
-		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()->id, 0, stride);
-		glVertexArrayBindingDivisor(id, binding, divisor);
-	}
-
-	unsigned offset = 0;
-	for(VertexAttribute a: fmt)
-	{
-		unsigned sem = get_attribute_semantic(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(integer)
-				glVertexArrayAttribIFormat(id, sem, cc, type, offset);
-			else
-				glVertexArrayAttribFormat(id, sem, cc, type, true, offset);
-			glVertexArrayAttribBinding(id, sem, binding);
-			glEnableVertexArrayAttrib(id, sem);
-		}
-		else
-		{
-			if(integer)
-				glVertexAttribIPointer(sem, cc, type, stride, reinterpret_cast<void *>(offset));
-			else
-				glVertexAttribPointer(sem, cc, type, true, stride, reinterpret_cast<void *>(offset));
-			if(ARB_instanced_arrays)
-				glVertexAttribDivisor(sem, divisor);
-			glEnableVertexAttribArray(sem);
-		}
-		offset += get_attribute_size(a);
-	}
-
-	if(!direct)
-		glBindBuffer(GL_ARRAY_BUFFER, 0);
-}
-
 void VertexSetup::unload()
 {
-	if(ARB_direct_state_access)
-	{
-		glVertexArrayVertexBuffer(id, 0, 0, 0, 0);
-		glVertexArrayVertexBuffer(id, 1, 0, 0, 0);
-		glVertexArrayElementBuffer(id, 0);
-	}
-	else
-	{
-		glBindVertexArray(id);
-		glBindBuffer(GL_ARRAY_BUFFER, 0);
-
-		for(VertexAttribute a: vertex_format)
-		{
-			unsigned sem = get_attribute_semantic(a);
-			glDisableVertexAttribArray(sem);
-			glVertexAttribPointer(sem, 1, GL_FLOAT, false, 0, 0);
-		}
-		for(VertexAttribute a: inst_format)
-		{
-			unsigned sem = get_attribute_semantic(a);
-			glDisableVertexAttribArray(sem);
-			glVertexAttribPointer(sem, 1, GL_FLOAT, false, 0, 0);
-		}
-
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-	}
+	VertexSetupBackend::unload();
 
 	vertex_array = 0;
 	vertex_format = VertexFormat();
@@ -218,15 +93,5 @@ void VertexSetup::unload()
 	index_buffer = 0;
 }
 
-void VertexSetup::set_debug_name(const string &name)
-{
-#ifdef DEBUG
-	if(KHR_debug)
-		glObjectLabel(GL_VERTEX_ARRAY, id, name.size(), name.c_str());
-#else
-	(void)name;
-#endif
-}
-
 } // namespace GL
 } // namespace Msp