X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexsetup.cpp;h=d50406a1ab70ce44e7caf645d46009a308c8e86f;hp=19edfb39e4a6da0b2ddfe6a0d5566d8d27c56254;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=746358b723bdb1ed71584d6fd28f783feb434aef

diff --git a/source/vertexsetup.cpp b/source/vertexsetup.cpp
index 19edfb39..d50406a1 100644
--- a/source/vertexsetup.cpp
+++ b/source/vertexsetup.cpp
@@ -42,7 +42,8 @@ void VertexSetup::set_vertex_array(const VertexArray &a)
 		throw invalid_argument("VertexSetup::set_vertex_array");
 
 	vertex_array = &a;
-	update(VERTEX_ARRAY);
+	update(get_update_mask(VERTEX_ARRAY, vertex_format, *vertex_array));
+	vertex_format = vertex_array->get_format();
 }
 
 void VertexSetup::set_instance_array(const VertexArray *a)
@@ -56,7 +57,8 @@ void VertexSetup::set_instance_array(const VertexArray *a)
 	}
 
 	inst_array = a;
-	update(INSTANCE_ARRAY);
+	update(get_update_mask(INSTANCE_ARRAY, inst_format, *inst_array));
+	inst_format = inst_array->get_format();
 }
 
 void VertexSetup::set_index_buffer(const Buffer &ibuf)
@@ -65,6 +67,34 @@ void VertexSetup::set_index_buffer(const Buffer &ibuf)
 	update(INDEX_BUFFER);
 }
 
+void VertexSetup::refresh()
+{
+	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);
+}
+
+unsigned VertexSetup::get_attribs(const VertexFormat &fmt)
+{
+	unsigned mask = 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);
+		mask |= 1<<t;
+	}
+	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;
@@ -74,14 +104,23 @@ 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);
 
-	if(mask&INSTANCE_ARRAY)
-	{
-		if(inst_array)
-			update_vertex_array(*inst_array, 1, 1, direct);
-	}
+	if((mask&INSTANCE_ARRAY) && inst_array)
+		update_vertex_array(*inst_array, 1, 1, direct);
 
 	if(mask&INDEX_BUFFER)
 	{