X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fvertexsetup.cpp;h=81d2261e6aa78b55b3240e231ea72b25232bea60;hp=4b2e2a5f0e5b8d3ccfb1bb435772f58557c15efb;hb=e92de029768eef5f0fd744329e589161b46d0762;hpb=fcde8390ad577fe434dcd4b29e0f410d29f867c9

diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp
index 4b2e2a5f..81d2261e 100644
--- a/source/core/vertexsetup.cpp
+++ b/source/core/vertexsetup.cpp
@@ -5,8 +5,10 @@
 #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 "error.h"
 #include "gl.h"
 #include "misc.h"
@@ -22,7 +24,8 @@ VertexSetup::VertexSetup():
 	dirty(0),
 	vertex_array(0),
 	inst_array(0),
-	index_buffer(0)
+	index_buffer(0),
+	index_type(UNSIGNED_SHORT)
 {
 	static Require req(ARB_vertex_array_object);
 	if(ARB_direct_state_access)
@@ -33,124 +36,122 @@ VertexSetup::VertexSetup():
 
 VertexSetup::~VertexSetup()
 {
-	if(current()==this)
-		unbind();
 	glDeleteVertexArrays(1, &id);
 }
 
-void VertexSetup::set_vertex_array(const VertexArray &a)
+void VertexSetup::set_format(const VertexFormat &vfmt)
 {
-	if(!verify_array(a))
-		throw invalid_argument("VertexSetup::set_vertex_array");
+	if(!verify_format(vfmt))
+		throw invalid_argument("VertexSetup::set_format");
+	if(!vertex_format.empty())
+		throw invalid_operation("VertexSetup::set_format");
 
-	vertex_array = &a;
-	update(get_update_mask(VERTEX_ARRAY, vertex_format, *vertex_array));
-	vertex_format = vertex_array->get_format();
+	require_format(vfmt);
+
+	vertex_format = vfmt;
 }
 
-void VertexSetup::set_instance_array(const VertexArray *a)
+void VertexSetup::set_format_instanced(const VertexFormat &vfmt, const VertexFormat &ifmt)
 {
-	if(a)
-	{
-		if(!verify_array(*a))
-			throw invalid_argument("VertexSetup::set_instance_array");
+	if(!verify_format(vfmt) || !verify_format(ifmt))
+		throw invalid_argument("VertexSetup::set_format");
+	if(!vertex_format.empty())
+		throw invalid_operation("VertexSetup::set_format");
 
-		static Require req(ARB_instanced_arrays);
-	}
+	require_format(vfmt);
+	require_format(ifmt);
 
-	inst_array = a;
-	update(get_update_mask(INSTANCE_ARRAY, inst_format, *inst_array));
-	inst_format = inst_array->get_format();
+	vertex_format = vfmt;
+	inst_format = ifmt;
 }
 
-void VertexSetup::set_index_buffer(const Buffer &ibuf)
+void VertexSetup::set_vertex_array(const VertexArray &a)
 {
-	index_buffer = &ibuf;
-	update(INDEX_BUFFER);
+	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;
+	dirty |= VERTEX_ARRAY;
 }
 
-void VertexSetup::refresh()
+void VertexSetup::set_instance_array(const VertexArray &a)
 {
-	if(vertex_array && vertex_array->get_format()!=vertex_format)
-		set_vertex_array(*vertex_array);
+	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");
+
+	static Require req(ARB_instanced_arrays);
 
-	if(inst_array && inst_array->get_format()!=inst_format)
-		set_instance_array(inst_array);
+	inst_array = &a;
+	dirty |= INSTANCE_ARRAY;
 }
 
-bool VertexSetup::verify_array(const VertexArray &array)
+void VertexSetup::set_index_buffer(const Buffer &ibuf, DataType itype)
 {
-	if(!array.get_buffer())
+	index_buffer = &ibuf;
+	index_type = itype;
+	dirty |= INDEX_BUFFER;
+}
+
+bool VertexSetup::verify_format(const VertexFormat &fmt)
+{
+	if(fmt.empty())
 		return false;
 
-	static int max_attribs = -1;
-	if(max_attribs<0)
-		max_attribs = get_i(GL_MAX_VERTEX_ATTRIBS);
+	unsigned max_attribs = Limits::get_global().max_vertex_attributes;
 
-	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)
+	for(const UInt16 *a=fmt.begin(); a!=fmt.end(); ++a)
+		if(get_attribute_semantic(*a)>=max_attribs)
 			return false;
 
 	return true;
 }
 
-unsigned VertexSetup::get_attribs(const VertexFormat &fmt)
+void VertexSetup::require_format(const VertexFormat &fmt)
 {
-	unsigned mask = 0;
-	for(const unsigned char *a=fmt.begin(); a!=fmt.end(); ++a)
-		mask |= 1<<get_attribute_semantic(*a);
-	return mask;
-}
+	bool has_int = false;
+	for(const UInt16 *a=fmt.begin(); a!=fmt.end(); ++a)
+		has_int = has_int | is_integer_attribute(*a);
 
-unsigned VertexSetup::get_update_mask(unsigned base, const VertexFormat &cur_fmt, const VertexArray &new_array)
-{
-	unsigned unused = get_attribs(cur_fmt)&~get_attribs(new_array.get_format());
-	return base | (unused ? UNUSED_ATTRIBS | (unused<<ATTRIB_SHIFT) : 0);
+	if(has_int)
+		static Require _req(EXT_gpu_shader4);
 }
 
-void VertexSetup::update(unsigned mask) const
+void VertexSetup::update() 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)
+	if(dirty&VERTEX_ARRAY)
 		update_vertex_array(*vertex_array, 0, 0, direct);
 
-	if((mask&INSTANCE_ARRAY) && inst_array)
+	if(dirty&INSTANCE_ARRAY)
 		update_vertex_array(*inst_array, 1, 1, direct);
 
-	if(mask&INDEX_BUFFER)
+	if(dirty&INDEX_BUFFER)
 	{
 		if(direct)
 			glVertexArrayElementBuffer(id, index_buffer->get_id());
 		else
-			glBindBuffer(ELEMENT_ARRAY_BUFFER, index_buffer->get_id());
+			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, index_buffer->get_id());
 	}
+
+	dirty = 0;
 }
 
 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);
+	if(!direct)
+		glBindBuffer(GL_ARRAY_BUFFER, array.get_buffer()->get_id());
 
 	const VertexFormat &fmt = array.get_format();
-	unsigned stride = fmt.stride()*sizeof(float);
+	unsigned stride = fmt.stride();
 	if(direct)
 	{
 		glVertexArrayVertexBuffer(id, binding, array.get_buffer()->get_id(), 0, stride);
@@ -158,56 +159,72 @@ void VertexSetup::update_vertex_array(const VertexArray &array, unsigned binding
 	}
 
 	unsigned offset = 0;
-	for(const unsigned char *a=fmt.begin(); a!=fmt.end(); ++a)
+	for(const UInt16 *a=fmt.begin(); a!=fmt.end(); ++a)
 	{
 		unsigned sem = get_attribute_semantic(*a);
-		unsigned sz = get_attribute_size(*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(*a==COLOR4_UBYTE)
-				glVertexArrayAttribFormat(id, sem, 4, GL_UNSIGNED_BYTE, true, offset);
+			if(integer)
+				glVertexArrayAttribIFormat(id, sem, cc, type, offset);
 			else
-				glVertexArrayAttribFormat(id, sem, sz, GL_FLOAT, false, offset);
+				glVertexArrayAttribFormat(id, sem, cc, type, true, 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));
+			if(integer)
+				glVertexAttribIPointer(sem, cc, type, stride, reinterpret_cast<void *>(offset));
 			else
-				glVertexAttribPointer(sem, sz, GL_FLOAT, false, stride, reinterpret_cast<float *>(offset));
+				glVertexAttribPointer(sem, cc, type, true, stride, reinterpret_cast<void *>(offset));
 			if(ARB_instanced_arrays)
 				glVertexAttribDivisor(sem, divisor);
 			glEnableVertexAttribArray(sem);
 		}
-		offset += sz*sizeof(float);
+		offset += get_attribute_size(*a);
 	}
+
+	if(!direct)
+		glBindBuffer(GL_ARRAY_BUFFER, 0);
 }
 
-void VertexSetup::bind() const
+void VertexSetup::unload()
 {
-	if(!vertex_array || !index_buffer)
-		throw invalid_operation("VertexSetup::bind");
-
-	if(set_current(this))
+	if(ARB_direct_state_access)
+	{
+		glVertexArrayVertexBuffer(id, 0, 0, 0, 0);
+		glVertexArrayVertexBuffer(id, 1, 0, 0, 0);
+		glVertexArrayElementBuffer(id, 0);
+	}
+	else
 	{
-		vertex_array->refresh();
-		if(inst_array)
-			inst_array->refresh();
 		glBindVertexArray(id);
-		if(dirty)
+		glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+		for(const UInt16 *a=vertex_format.begin(); a!=vertex_format.end(); ++a)
 		{
-			update(dirty);
-			dirty = 0;
+			unsigned sem = get_attribute_semantic(*a);
+			glDisableVertexAttribArray(sem);
+			glVertexAttribPointer(sem, 1, GL_FLOAT, false, 0, 0);
 		}
+		for(const UInt16 *a=inst_format.begin(); a!=inst_format.end(); ++a)
+		{
+			unsigned sem = get_attribute_semantic(*a);
+			glDisableVertexAttribArray(sem);
+			glVertexAttribPointer(sem, 1, GL_FLOAT, false, 0, 0);
+		}
+
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 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;
 }
 
 void VertexSetup::set_debug_name(const string &name)