X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=d3124f0da334c7439e630266db0eef7c8c4654cf;hb=6d2e2a0bb28496a8c25b441009bdd2a1a1e72d81;hp=5262d09a90ee2862e6c0db07dcd02e71044241fd;hpb=99ca354f18119f82f1adeca100cd665a8f640317;p=libs%2Fgl.git

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 5262d09a..d3124f0d 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -139,6 +139,11 @@ void Renderer::add_shader_data(const ProgramData &d)
 }
 
 void Renderer::set_texture(Tag tag, const Texture *tex, const Sampler *samp)
+{
+	set_texture(tag, tex, -1, samp);
+}
+
+void Renderer::set_texture(Tag tag, const Texture *tex, int level, const Sampler *samp)
 {
 	State &state = get_state();
 
@@ -170,6 +175,7 @@ void Renderer::set_texture(Tag tag, const Texture *tex, const Sampler *samp)
 	bound_tex.tag = tag;
 	bound_tex.texture = tex;
 	bound_tex.sampler = samp;
+	bound_tex.level = level;
 	state.texture_count = texture_stack.size();
 }
 
@@ -241,7 +247,7 @@ void Renderer::clear(const ClearValue *values)
 void Renderer::draw(const Batch &batch)
 {
 	apply_state();
-	batch.refresh();
+	batch.refresh(frame_index);
 	pipeline_state.set_primitive_type(batch.get_type());
 	commands.use_pipeline(&pipeline_state);
 	commands.draw(batch);
@@ -250,7 +256,7 @@ void Renderer::draw(const Batch &batch)
 void Renderer::draw_instanced(const Batch &batch, unsigned count)
 {
 	apply_state();
-	batch.refresh();
+	batch.refresh(frame_index);
 	pipeline_state.set_primitive_type(batch.get_type());
 	commands.use_pipeline(&pipeline_state);
 	commands.draw_instanced(batch, count);
@@ -317,7 +323,7 @@ void Renderer::apply_state()
 			shdata_stack.erase(shdata_stack.begin()+state.shdata_count, shdata_stack.end());
 		for(const BoundProgramData &d: shdata_stack)
 		{
-			d.shdata->apply(*state.shprog, pipeline_state);
+			d.shdata->apply(*state.shprog, pipeline_state, frame_index);
 			d.generation = d.shdata->get_generation();
 		}
 		changed &= ~SHADER_DATA;
@@ -326,9 +332,9 @@ void Renderer::apply_state()
 	if(state.vertex_setup)
 	{
 		if(const VertexArray *array = state.vertex_setup->get_vertex_array())
-			array->refresh();
+			array->refresh(frame_index);
 		if(const VertexArray *array = state.vertex_setup->get_instance_array())
-			array->refresh();
+			array->refresh(frame_index);
 	}
 	pipeline_state.set_vertex_setup(state.vertex_setup);
 
@@ -344,7 +350,7 @@ void Renderer::apply_state()
 			if(t.binding<0 || shprog_changed)
 				t.binding = state.shprog->get_uniform_binding(t.tag);
 			if(t.binding>=0)
-				pipeline_state.set_texture(t.binding, t.texture, t.sampler);
+				pipeline_state.set_texture(t.binding, t.texture, t.level, t.sampler);
 		}
 
 	pipeline_state.set_depth_test(state.depth_test);