Use DynamicObjectLoader for Material and Scene generic loaders

[libs/gl.git] / source / render / renderer.cpp

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 19148a4dbf5a4f9bf1c9743481336ecf80297bb3..a515071d29f9d4cdb8ab5f74236369deeba5b3f9 100644 (file)
--- 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);
 }
@@ -280,6 +282,16 @@ void Renderer::resolve_multisample(Framebuffer &target)
        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()
 {
        if(!state->shprog)