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

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 52edc249..5610f30a 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -1,6 +1,3 @@
-#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"
@@ -24,13 +21,15 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Renderer::Renderer()
+Renderer::Renderer():
+	changed(0)
 {
 	state_stack.reserve(16);
 	state_stack.push_back(State());
 	shdata_stack.reserve(32);
 	state = &state_stack.back();
 	add_shader_data(standard_shdata);
+	commands.use_pipeline(pipeline_state);
 }
 
 Renderer::~Renderer()
@@ -252,22 +251,21 @@ void Renderer::clear()
 void Renderer::clear(BufferBits buffers)
 {
 	pipeline_state.set_framebuffer(state->framebuffer);
-	pipeline_state.apply();
-	glClear(buffers);
+	commands.clear(buffers);
 }
 
 void Renderer::draw(const Batch &batch)
 {
 	apply_state();
-
-	batch.draw();
+	batch.refresh();
+	commands.draw(batch);
 }
 
 void Renderer::draw_instanced(const Batch &batch, unsigned count)
 {
 	apply_state();
-
-	batch.draw_instanced(count);
+	batch.refresh();
+	commands.draw_instanced(batch, count);
 }
 
 void Renderer::resolve_multisample(Framebuffer &target, BufferBits buffers)
@@ -280,20 +278,8 @@ void Renderer::resolve_multisample(Framebuffer &target, BufferBits buffers)
 	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);
-	}
+	pipeline_state.set_framebuffer(state->framebuffer);
+	commands.resolve_multisample(target, buffers);
 }
 
 void Renderer::apply_state()
@@ -360,8 +346,6 @@ void Renderer::apply_state()
 	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();
 }
 
 
@@ -385,7 +369,6 @@ Renderer::State::State():
 	viewport(0),
 	scissor(0),
 	texture_count(0),
-	lowest_effect_texunit(Limits::get_global().max_texture_bindings),
 	clipping(0),
 	shprog(0),
 	shdata_count(0),