X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fvertexsetup.cpp;h=da79e7f6135f9b3d06badf30e024903e7d5b280a;hp=d9e9d0959ce907d804f9695cdefea6e29828c810;hb=d40673bd28c4b4524d3642b949d9d109dc6f9f24;hpb=11266e8093e56524a68de1d0a08d275de95c56a0

diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp
index d9e9d095..da79e7f6 100644
--- a/source/core/vertexsetup.cpp
+++ b/source/core/vertexsetup.cpp
@@ -38,29 +38,53 @@ VertexSetup::~VertexSetup()
 	glDeleteVertexArrays(1, &id);
 }
 
+void VertexSetup::set_format(const VertexFormat &vfmt)
+{
+	if(!verify_format(vfmt))
+		throw invalid_argument("VertexSetup::set_format");
+	if(!vertex_format.empty())
+		throw invalid_operation("VertexSetup::set_format");
+
+	vertex_format = 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");
+	if(!vertex_format.empty())
+		throw invalid_operation("VertexSetup::set_format");
+
+	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();
+	update(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");
+	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);
-	}
+	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();
+	inst_array = &a;
+	update(INSTANCE_ARRAY);
 }
 
 void VertexSetup::set_index_buffer(const Buffer &ibuf)
@@ -69,25 +93,15 @@ void VertexSetup::set_index_buffer(const Buffer &ibuf)
 	update(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;
@@ -95,20 +109,6 @@ bool VertexSetup::verify_array(const VertexArray &array)
 	return true;
 }
 
-unsigned VertexSetup::get_attribs(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;
-}
-
-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);
-}
-
 void VertexSetup::update(unsigned mask) const
 {
 	static bool direct = ARB_direct_state_access && ARB_vertex_attrib_binding;
@@ -118,18 +118,6 @@ void VertexSetup::update(unsigned mask) const
 		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);
 
@@ -223,13 +211,19 @@ void VertexSetup::unload()
 		BindRestore _bind(*this);
 		Buffer::unbind_from(ARRAY_BUFFER);
 
-		unsigned mask = get_attribs(vertex_format)|get_attribs(inst_format);
-		for(unsigned i=0; mask; ++i, mask>>=1)
-			if(mask&1)
-			{
-				glDisableVertexAttribArray(i);
-				glVertexAttribPointer(i, 1, GL_FLOAT, false, 0, 0);
-			}
+		for(const unsigned char *a=vertex_format.begin(); a!=vertex_format.end(); ++a)
+		{
+			unsigned sem = get_attribute_semantic(*a);
+			glDisableVertexAttribArray(sem);
+			glVertexAttribPointer(sem, 1, GL_FLOAT, false, 0, 0);
+		}
+		for(const unsigned char *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(ELEMENT_ARRAY_BUFFER, 0);
 	}