X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=52edc24924d73c262243fbd1226a296b5f8f2d0f;hb=ce36589;hp=68b7927dcb7067c0e3331c33f3f09bab1bf6a04a;hpb=2b2676392aff2eb6b38c3e463cc67f4d67a4ef8b;p=libs%2Fgl.git

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 68b7927d..52edc249 100644
--- 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)
@@ -226,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();
@@ -240,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)
@@ -254,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);
 
@@ -321,6 +381,9 @@ 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),