X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=4beb2da7eca300d13450806b65d2eb503cd71f8e;hb=b4941cd1f0b0b5d9cebc978379b4936a5070ca92;hp=946f0100bbbf0a5467877e451343d643a0f13670;hpb=c89c1fb972fae2cb2f720cb3ec6cf8238ae8d2e1;p=libs%2Fgl.git

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 946f0100..4beb2da7 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -10,6 +10,7 @@
 #include "renderable.h"
 #include "renderer.h"
 #include "resourcemanager.h"
+#include "resources.h"
 #include "sampler.h"
 #include "texture.h"
 #include "vertexarray.h"
@@ -20,7 +21,8 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Renderer::Renderer()
+Renderer::Renderer():
+	placeholder_texture(Resources::get_global().get<Texture>("_placeholder.png"))
 {
 	state_stack.reserve(16);
 	shdata_stack.reserve(32);
@@ -148,8 +150,12 @@ void Renderer::set_texture(Tag tag, const Texture *tex, int level, const Sampler
 	State &state = get_state();
 
 	if(tex)
+	{
 		if(ResourceManager *res_mgr = tex->get_manager())
 			res_mgr->resource_used(*tex);
+		if(!tex->is_loaded())
+			tex = &placeholder_texture;
+	}
 
 	if(texture_stack.size()>state.texture_count)
 	{
@@ -247,7 +253,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);
@@ -256,7 +262,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);
@@ -323,7 +329,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;
@@ -332,9 +338,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);