X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fvertexsetup.cpp;h=61bf032c0fcaecae0ffac46fef15c95f86e95952;hp=f6f0f58b65397cabdba6f9cbdc42bf027503689d;hb=d16d28d2ccf7c6255204f02975834f713ff1df08;hpb=6d33ca40415937790ed0cddc97148b5fbd90ccaf

diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp
index f6f0f58b..61bf032c 100644
--- a/source/core/vertexsetup.cpp
+++ b/source/core/vertexsetup.cpp
@@ -1,14 +1,5 @@
-#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 <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"
+#include "device.h"
 #include "error.h"
-#include "gl.h"
-#include "misc.h"
 #include "vertexarray.h"
 #include "vertexsetup.h"
 
@@ -17,196 +8,89 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-VertexSetup::VertexSetup():
-	dirty(0),
-	vertex_array(0),
-	inst_array(0),
-	index_buffer(0)
+void VertexSetup::set_format(const VertexFormat &vfmt)
 {
-	static Require req(ARB_vertex_array_object);
-	if(ARB_direct_state_access)
-		glCreateVertexArrays(1, &id);
-	else
-		glGenVertexArrays(1, &id);
+	if(!verify_format(vfmt))
+		throw invalid_argument("VertexSetup::set_format");
+	if(!vertex_format.empty())
+		throw invalid_operation("VertexSetup::set_format");
+
+	require_format(vfmt, false);
+
+	vertex_format = vfmt;
 }
 
-VertexSetup::~VertexSetup()
+void VertexSetup::set_format_instanced(const VertexFormat &vfmt, const VertexFormat &ifmt)
 {
-	if(current()==this)
-		unbind();
-	glDeleteVertexArrays(1, &id);
+	if(!verify_format(vfmt) || !verify_format(ifmt))
+		throw invalid_argument("VertexSetup::set_format_instanced");
+	if(!vertex_format.empty())
+		throw invalid_operation("VertexSetup::set_format_instanced");
+
+	require_format(vfmt, false);
+	require_format(ifmt, true);
+
+	vertex_format = vfmt;
+	inst_format = ifmt;
 }
 
 void VertexSetup::set_vertex_array(const VertexArray &a)
 {
-	if(!verify_array(a))
+	if(vertex_format.empty())
+		throw invalid_operation("VertexSetup::set_vertex_array");
+	if(a.get_format()!=vertex_format)
+		throw incompatible_data("VertexSetup::set_vertex_array");
+	if(!a.get_buffer())
 		throw invalid_argument("VertexSetup::set_vertex_array");
 
 	vertex_array = &a;
-	update(get_update_mask(VERTEX_ARRAY, vertex_format, *vertex_array));
-	vertex_format = vertex_array->get_format();
+	dirty |= VERTEX_ARRAY;
 }
 
-void VertexSetup::set_instance_array(const VertexArray *a)
+void VertexSetup::set_instance_array(const VertexArray &a)
 {
-	if(a)
-	{
-		if(!verify_array(*a))
-			throw invalid_argument("VertexSetup::set_instance_array");
-
-		static Require req(ARB_instanced_arrays);
-	}
-
-	inst_array = a;
-	update(get_update_mask(INSTANCE_ARRAY, inst_format, *inst_array));
-	inst_format = inst_array->get_format();
+	if(inst_format.empty())
+		throw invalid_operation("VertexSetup::set_instance_array");
+	if(a.get_format()!=inst_format)
+		throw incompatible_data("VertexSetup::set_instance_array");
+	if(!a.get_buffer())
+		throw invalid_argument("VertexSetup::set_instance_array");
+
+	inst_array = &a;
+	dirty |= INSTANCE_ARRAY;
 }
 
-void VertexSetup::set_index_buffer(const Buffer &ibuf)
+void VertexSetup::set_index_buffer(const Buffer &ibuf, DataType itype)
 {
 	index_buffer = &ibuf;
-	update(INDEX_BUFFER);
+	index_type = itype;
+	dirty |= INDEX_BUFFER;
 }
 
-void VertexSetup::refresh()
+bool VertexSetup::verify_format(const VertexFormat &fmt)
 {
-	if(vertex_array && vertex_array->get_format()!=vertex_format)
-		set_vertex_array(*vertex_array);
-
-	if(inst_array && inst_array->get_format()!=inst_format)
-		set_instance_array(inst_array);
-}
-
-bool VertexSetup::verify_array(const VertexArray &array)
-{
-	if(!array.get_buffer())
+	if(fmt.empty())
 		return false;
 
-	static int max_attribs = -1;
-	if(max_attribs<0)
-		max_attribs = get_i(GL_MAX_VERTEX_ATTRIBS);
-
-	const VertexFormat &fmt = array.get_format();
-	for(const unsigned char *a=fmt.begin(); a!=fmt.end(); ++a)
-		if(static_cast<int>(get_attribute_semantic(*a))>=max_attribs)
-			return false;
-
-	return true;
+	static unsigned max_attribs = Device::get_current().get_info().limits.max_vertex_attributes;
+	return all_of(fmt.begin(), fmt.end(), [](VertexAttribute a){ return get_attribute_semantic(a)<max_attribs; });
 }
 
-unsigned VertexSetup::get_attribs(const VertexFormat &fmt)
+void VertexSetup::update() const
 {
-	unsigned mask = 0;
-	for(const unsigned char *a=fmt.begin(); a!=fmt.end(); ++a)
-		mask |= 1<<get_attribute_semantic(*a);
-	return mask;
+	VertexSetupBackend::update(dirty);
+	dirty = 0;
 }
 
-unsigned VertexSetup::get_update_mask(unsigned base, const VertexFormat &cur_fmt, const VertexArray &new_array)
+void VertexSetup::unload()
 {
-	unsigned unused = get_attribs(cur_fmt)&~get_attribs(new_array.get_format());
-	return base | (unused ? UNUSED_ATTRIBS | (unused<<ATTRIB_SHIFT) : 0);
-}
-
-void VertexSetup::update(unsigned mask) const
-{
-	static bool direct = ARB_direct_state_access && ARB_vertex_attrib_binding;
-	if(!direct && current()!=this)
-	{
-		dirty |= mask;
-		return;
-	}
-
-	if(mask&UNUSED_ATTRIBS)
-	{
-		for(unsigned i=0, am=mask>>ATTRIB_SHIFT; am; ++i, am>>=1)
-			if(am&1)
-			{
-				if(direct)
-					glDisableVertexArrayAttrib(id, i);
-				else
-					glDisableVertexAttribArray(i);
-			}
-	}
-
-	if(mask&VERTEX_ARRAY)
-		update_vertex_array(*vertex_array, 0, 0, direct);
-
-	if((mask&INSTANCE_ARRAY) && inst_array)
-		update_vertex_array(*inst_array, 1, 1, direct);
-
-	if(mask&INDEX_BUFFER)
-	{
-		if(direct)
-			glVertexArrayElementBuffer(id, index_buffer->get_id());
-		else
-			glBindBuffer(ELEMENT_ARRAY_BUFFER, index_buffer->get_id());
-	}
-}
+	VertexSetupBackend::unload();
 
-void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding, unsigned divisor, bool direct) const
-{
-	Conditional<Bind> bind_vbuf(!direct, array.get_buffer(), ARRAY_BUFFER);
-
-	const VertexFormat &fmt = array.get_format();
-	unsigned stride = fmt.stride()*sizeof(float);
-	if(direct)
-	{
-		glVertexArrayVertexBuffer(id, binding, array.get_buffer()->get_id(), 0, stride);
-		glVertexArrayBindingDivisor(id, binding, divisor);
-	}
-
-	unsigned offset = 0;
-	for(const unsigned char *a=fmt.begin(); a!=fmt.end(); ++a)
-	{
-		unsigned sem = get_attribute_semantic(*a);
-		unsigned sz = get_attribute_size(*a);
-		if(direct)
-		{
-			if(*a==COLOR4_UBYTE)
-				glVertexArrayAttribFormat(id, sem, 4, GL_UNSIGNED_BYTE, true, offset);
-			else
-				glVertexArrayAttribFormat(id, sem, sz, GL_FLOAT, false, offset);
-			glVertexArrayAttribBinding(id, sem, binding);
-			glEnableVertexArrayAttrib(id, sem);
-		}
-		else
-		{
-			if(*a==COLOR4_UBYTE)
-				glVertexAttribPointer(sem, 4, GL_UNSIGNED_BYTE, true, stride, reinterpret_cast<unsigned char *>(offset));
-			else
-				glVertexAttribPointer(sem, sz, GL_FLOAT, false, stride, reinterpret_cast<float *>(offset));
-			if(ARB_instanced_arrays)
-				glVertexAttribDivisor(sem, divisor);
-			glEnableVertexAttribArray(sem);
-		}
-		offset += sz*sizeof(float);
-	}
-}
-
-void VertexSetup::bind() const
-{
-	if(!vertex_array || !index_buffer)
-		throw invalid_operation("VertexSetup::bind");
-
-	if(set_current(this))
-	{
-		vertex_array->refresh();
-		if(inst_array)
-			inst_array->refresh();
-		glBindVertexArray(id);
-		if(dirty)
-		{
-			update(dirty);
-			dirty = 0;
-		}
-	}
-}
-
-void VertexSetup::unbind()
-{
-	if(set_current(0))
-		glBindVertexArray(0);
+	vertex_array = 0;
+	vertex_format = VertexFormat();
+	inst_array = 0;
+	inst_format = VertexFormat();
+	index_buffer = 0;
 }
 
 } // namespace GL