X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=5e155f2e970ac75f4ba85b59d857e66aa3c30f0b;hb=77a534371433054384d213922a2e8c55f8a69ad6;hp=aa6c9b55a4d4206ef458012e280efdacb3e9aba5;hpb=006bdb4f8660098fc524dcca80b24c943c65b249;p=libs%2Fgl.git

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index aa6c9b55..5e155f2e 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -1,9 +1,8 @@
 #include "batch.h"
 #include "buffer.h"
 #include "camera.h"
-#include "clipping.h"
-#include "deviceinfo.h"
 #include "error.h"
+#include "framebuffer.h"
 #include "lighting.h"
 #include "material.h"
 #include "program.h"
@@ -29,7 +28,6 @@ Renderer::Renderer():
 	shdata_stack.reserve(32);
 	state = &state_stack.back();
 	add_shader_data(standard_shdata);
-	commands.use_pipeline(pipeline_state);
 }
 
 Renderer::~Renderer()
@@ -125,13 +123,6 @@ void Renderer::set_lighting(const Lighting *l)
 		add_shader_data(l->get_shader_data());
 }
 
-void Renderer::set_clipping(const Clipping *c)
-{
-	state->clipping = c;
-	if(c)
-		add_shader_data(c->get_shader_data());
-}
-
 void Renderer::set_shader_program(const Program *p, const ProgramData *d)
 {
 	state->shprog = p;
@@ -224,7 +215,7 @@ void Renderer::end()
 	add_shader_data(standard_shdata);
 	excluded.clear();
 
-	PipelineState::clear();
+	commands.use_pipeline(0);
 }
 
 void Renderer::exclude(const Renderable &renderable)
@@ -246,6 +237,9 @@ void Renderer::render(const Renderable &renderable, Tag tag)
 void Renderer::clear(const ClearValue *values)
 {
 	pipeline_state.set_framebuffer(state->framebuffer);
+	pipeline_state.set_viewport(state->viewport);
+	pipeline_state.set_scissor(state->scissor);
+	commands.use_pipeline(&pipeline_state);
 	commands.clear(values);
 }
 
@@ -253,6 +247,7 @@ void Renderer::draw(const Batch &batch)
 {
 	apply_state();
 	batch.refresh();
+	commands.use_pipeline(&pipeline_state);
 	commands.draw(batch);
 }
 
@@ -260,10 +255,11 @@ void Renderer::draw_instanced(const Batch &batch, unsigned count)
 {
 	apply_state();
 	batch.refresh();
+	commands.use_pipeline(&pipeline_state);
 	commands.draw_instanced(batch, count);
 }
 
-void Renderer::resolve_multisample(Framebuffer &target, BufferBits buffers)
+void Renderer::resolve_multisample(Framebuffer &target)
 {
 	if(!state->framebuffer)
 		throw invalid_operation("Renderer::resolve_multisample");
@@ -274,7 +270,18 @@ void Renderer::resolve_multisample(Framebuffer &target, BufferBits buffers)
 		throw incompatible_data("Renderer::resolve_multisample");
 
 	pipeline_state.set_framebuffer(state->framebuffer);
-	commands.resolve_multisample(target, buffers);
+	commands.use_pipeline(&pipeline_state);
+	commands.resolve_multisample(target);
+}
+
+void Renderer::begin_query(const QueryPool &pool, unsigned index)
+{
+	commands.begin_query(pool, index);
+}
+
+void Renderer::end_query(const QueryPool &pool, unsigned index)
+{
+	commands.end_query(pool, index);
 }
 
 void Renderer::apply_state()
@@ -309,7 +316,6 @@ void Renderer::apply_state()
 
 	pipeline_state.set_front_face(state->front_face);
 	pipeline_state.set_face_cull(state->face_cull);
-	pipeline_state.set_enabled_clip_planes(state->clipping ? (1<<state->clipping->get_n_planes())-1 : 0);
 
 	if(state->texture_count<texture_stack.size())
 		flush_textures();
@@ -344,36 +350,8 @@ void Renderer::apply_state()
 }
 
 
-Renderer::BoundTexture::BoundTexture():
-	unit(-1),
-	texture(0),
-	sampler(0),
-	replaced(-1)
-{ }
-
-
 Renderer::BoundProgramData::BoundProgramData(const ProgramData *d):
-	shdata(d),
-	generation(0)
-{ }
-
-
-Renderer::State::State():
-	camera(0),
-	framebuffer(0),
-	viewport(0),
-	scissor(0),
-	texture_count(0),
-	clipping(0),
-	shprog(0),
-	shdata_count(0),
-	vertex_setup(0),
-	front_face(NON_MANIFOLD),
-	face_cull(NO_CULL),
-	depth_test(0),
-	stencil_test(0),
-	blend(0),
-	object_lod_bias(0)
+	shdata(d)
 { }
 
 } // namespace GL