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

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 999ff1a2..5262d09a 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -27,18 +27,19 @@ Renderer::Renderer()
 	texture_stack.reserve(32);
 }
 
-Renderer::~Renderer()
-{
-}
-
 void Renderer::begin()
 {
 	if(current_state)
 		throw invalid_operation("Renderer::begin");
 
-	state_stack.push_back(State());
+	++frame_index;
+	state_stack.emplace_back();
 	current_state = &state_stack.back();
+
+	RendererBackend::begin();
+
 	add_shader_data(standard_shdata);
+	commands.begin_frame(frame_index);
 }
 
 void Renderer::end()
@@ -46,12 +47,12 @@ void Renderer::end()
 	if(!current_state || state_stack.size()>1)
 		throw invalid_operation("Renderer::end");
 
+	RendererBackend::end();
+
 	current_state = 0;
 	state_stack.clear();
 	texture_stack.clear();
 	shdata_stack.clear();
-
-	commands.use_pipeline(0);
 }
 
 void Renderer::push_state()
@@ -164,7 +165,7 @@ void Renderer::set_texture(Tag tag, const Texture *tex, const Sampler *samp)
 			break;
 		}
 
-	texture_stack.push_back(BoundTexture());
+	texture_stack.emplace_back();
 	BoundTexture &bound_tex = texture_stack.back();
 	bound_tex.tag = tag;
 	bound_tex.texture = tex;
@@ -241,6 +242,7 @@ void Renderer::draw(const Batch &batch)
 {
 	apply_state();
 	batch.refresh();
+	pipeline_state.set_primitive_type(batch.get_type());
 	commands.use_pipeline(&pipeline_state);
 	commands.draw(batch);
 }
@@ -249,6 +251,7 @@ void Renderer::draw_instanced(const Batch &batch, unsigned count)
 {
 	apply_state();
 	batch.refresh();
+	pipeline_state.set_primitive_type(batch.get_type());
 	commands.use_pipeline(&pipeline_state);
 	commands.draw_instanced(batch, count);
 }