X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Finstancearray.cpp;h=a03fbf20dff9ca2766c15067087389e0d2902fd3;hb=b84ce32a8dfcacd54c3497c6e7facb5d65e82827;hp=f6a7bb634bd450c0f6f4d4011655331ca72e93ea;hpb=c0b7d6ee4a7478f5aecb1504429ec1fc846d64ed;p=libs%2Fgl.git

diff --git a/source/render/instancearray.cpp b/source/render/instancearray.cpp
index f6a7bb63..a03fbf20 100644
--- a/source/render/instancearray.cpp
+++ b/source/render/instancearray.cpp
@@ -15,10 +15,7 @@ namespace Msp {
 namespace GL {
 
 InstanceArray::InstanceArray(const Object &o):
-	object(o),
-	instance_buffer(0),
-	matrix_location(-1),
-	matrix_offset(0)
+	object(o)
 {
 	const Technique *tech = object.get_technique();
 	for(const auto &kvp: tech->get_methods())
@@ -88,7 +85,7 @@ void InstanceArray::update_instance_matrix(unsigned index)
 {
 	const Matrix &m = *instances[index]->get_matrix();
 
-	float *d = reinterpret_cast<float *>(instance_data.modify(instances.size()-1)+matrix_offset);
+	float *d = reinterpret_cast<float *>(instance_data.modify(index)+matrix_offset);
 	for(unsigned i=0; i<12; ++i)
 		d[i] = m(i/4, i%4);
 }
@@ -106,12 +103,11 @@ void InstanceArray::render(Renderer &renderer, Tag tag) const
 		return;
 
 	const Mesh *mesh = object.get_mesh();
-	mesh->get_vertices().refresh();
 	if(instance_buffer->get_size()==0)
-		instance_buffer->storage(instance_data.get_required_buffer_size());
-	instance_data.refresh();
+		instance_buffer->storage(instance_data.get_required_buffer_size(), STREAMING);
 
 	Renderer::Push push(renderer);
+	renderer.set_pipeline_key(this, tag.id);
 	method->apply(renderer);
 	mesh->draw_instanced(renderer, vtx_setup, instances.size());
 }