Miscellaneous cleanup

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

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 29db99232cd48a8a9e946b12f9326d32fb0e23a8..575b44a85ff4a56ed7351e0a8500a848ba8577c6 100644 (file)
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -1,3 +1,6 @@
+#include <msp/gl/extensions/arb_direct_state_access.h>
+#include <msp/gl/extensions/ext_framebuffer_blit.h>
+#include <msp/gl/extensions/ext_framebuffer_object.h>
 #include "batch.h"
 #include "buffer.h"
 #include "camera.h"
@@ -54,6 +57,21 @@ void Renderer::transform(const Matrix &matrix)
        changed |= MATRIX;
 }
 
+void Renderer::set_framebuffer(const Framebuffer *f)
+{
+       state->framebuffer = f;
+}
+
+void Renderer::set_viewport(const Rect *v)
+{
+       state->viewport = v;
+}
+
+void Renderer::set_scissor(const Rect *s)
+{
+       state->scissor = s;
+}
+
 void Renderer::set_texture(Tag tag, const Texture *tex, const Sampler *samp)
 {
        if(tex)
@@ -161,6 +179,21 @@ void Renderer::set_face_cull(CullMode cull)
        state->face_cull = cull;
 }
 
+void Renderer::set_depth_test(const DepthTest *dt)
+{
+       state->depth_test = dt;
+}
+
+void Renderer::set_stencil_test(const StencilTest *st)
+{
+       state->stencil_test = st;
+}
+
+void Renderer::set_blend(const Blend *b)
+{
+       state->blend = b;
+}
+
 void Renderer::set_object_lod_bias(unsigned b)
 {
        state->object_lod_bias = b;
@@ -211,6 +244,18 @@ void Renderer::render(const Renderable &renderable, Tag tag)
                renderable.render(*this, tag);
 }
 
+void Renderer::clear()
+{
+       clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT|STENCIL_BUFFER_BIT);
+}
+
+void Renderer::clear(BufferBits buffers)
+{
+       pipeline_state.set_framebuffer(state->framebuffer);
+       pipeline_state.apply();
+       glClear(buffers);
+}
+
 void Renderer::draw(const Batch &batch)
 {
        apply_state();
@@ -225,6 +270,32 @@ void Renderer::draw_instanced(const Batch &batch, unsigned count)
        batch.draw_instanced(count);
 }
 
+void Renderer::resolve_multisample(Framebuffer &target, BufferBits buffers)
+{
+       if(!state->framebuffer)
+               throw invalid_operation("Renderer::resolve_multisample");
+
+       unsigned width = state->framebuffer->get_width();
+       unsigned height = state->framebuffer->get_height();
+       if(target.get_width()!=width || target.get_height()!=height)
+               throw incompatible_data("Renderer::resolve_multisample");
+
+       if(ARB_direct_state_access)
+               glBlitNamedFramebuffer(state->framebuffer->get_id(), target.get_id(), 0, 0, width, height, 0, 0, width, height, buffers, GL_NEAREST);
+       else
+       {
+               glBindFramebuffer(GL_READ_FRAMEBUFFER, state->framebuffer->get_id());
+               glBindFramebuffer(GL_DRAW_FRAMEBUFFER, target.get_id());
+
+               target.refresh();
+
+               glBlitFramebuffer(0, 0, width, height, 0, 0, width, height, buffers, GL_NEAREST);
+
+               glBindFramebuffer(GL_FRAMEBUFFER, 0);
+               pipeline_state.set_framebuffer(0);
+       }
+}
+
 void Renderer::apply_state()
 {
        if(!state->shprog)
@@ -239,6 +310,10 @@ void Renderer::apply_state()
                changed &= ~MATRIX;
        }
 
+       pipeline_state.set_framebuffer(state->framebuffer);
+       pipeline_state.set_viewport(state->viewport);
+       pipeline_state.set_scissor(state->scissor);
+
        bool shprog_changed = (state->shprog!=pipeline_state.get_shader_program());
        pipeline_state.set_shader_program(state->shprog);
 
@@ -282,6 +357,10 @@ void Renderer::apply_state()
                changed &= ~SHADER_DATA;
        }
 
+       pipeline_state.set_depth_test(state->depth_test);
+       pipeline_state.set_stencil_test(state->stencil_test);
+       pipeline_state.set_blend(state->blend);
+
        pipeline_state.apply();
 }
 
@@ -302,14 +381,19 @@ Renderer::BoundProgramData::BoundProgramData(const ProgramData *d):
 
 Renderer::State::State():
        camera(0),
+       framebuffer(0),
+       viewport(0),
+       scissor(0),
        texture_count(0),
-       lowest_effect_texunit(Limits::get_global().max_texture_bindings),
        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)
 { }