X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=a515071d29f9d4cdb8ab5f74236369deeba5b3f9;hb=9813f8711628a0fbe786406e974dc33546dc9cee;hp=4320ef30e4e2e87815e0e1ab24212cf8d0eb2c2b;hpb=0d5406c66549a2cfc2fca701cc1c4972e7fd493a;p=libs%2Fgl.git

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 4320ef30..a515071d 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -2,8 +2,8 @@
 #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"
@@ -245,6 +245,8 @@ 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);
 }
@@ -265,7 +267,7 @@ void Renderer::draw_instanced(const Batch &batch, unsigned count)
 	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");
@@ -277,7 +279,17 @@ void Renderer::resolve_multisample(Framebuffer &target, BufferBits buffers)
 
 	pipeline_state.set_framebuffer(state->framebuffer);
 	commands.use_pipeline(&pipeline_state);
-	commands.resolve_multisample(target, buffers);
+	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()