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

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 4320ef30..b142da75 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"
@@ -265,7 +265,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 +277,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()