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

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 4acf3ded..5610f30a 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -15,20 +15,21 @@
 #include "texture.h"
 #include "vertexarray.h"
 #include "vertexsetup.h"
-#include "windingtest.h"
 
 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()
@@ -55,6 +56,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)
@@ -152,14 +168,29 @@ void Renderer::set_vertex_setup(const VertexSetup *vs)
 	state->vertex_setup = vs;
 }
 
-void Renderer::set_winding_test(const WindingTest *w)
+void Renderer::set_front_face(FaceWinding winding)
+{
+	state->front_face = winding;
+}
+
+void Renderer::set_face_cull(CullMode cull)
+{
+	state->face_cull = cull;
+}
+
+void Renderer::set_depth_test(const DepthTest *dt)
 {
-	state->winding_test = w;
+	state->depth_test = dt;
 }
 
-void Renderer::set_reverse_winding(bool r)
+void Renderer::set_stencil_test(const StencilTest *st)
 {
-	state->reverse_winding = r;
+	state->stencil_test = st;
+}
+
+void Renderer::set_blend(const Blend *b)
+{
+	state->blend = b;
 }
 
 void Renderer::set_object_lod_bias(unsigned b)
@@ -212,18 +243,43 @@ 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);
+	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.refresh();
+	commands.draw_instanced(batch, 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");
+
+	pipeline_state.set_framebuffer(state->framebuffer);
+	commands.resolve_multisample(target, buffers);
 }
 
 void Renderer::apply_state()
@@ -240,6 +296,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);
 
@@ -252,7 +312,8 @@ void Renderer::apply_state()
 	}
 	pipeline_state.set_vertex_setup(state->vertex_setup);
 
-	pipeline_state.set_winding_test((state->winding_test && state->reverse_winding) ? &state->winding_test->get_reverse() : state->winding_test);
+	pipeline_state.set_front_face(state->front_face);
+	pipeline_state.set_face_cull(state->face_cull);
 	pipeline_state.set_enabled_clip_planes(state->clipping ? (1<<state->clipping->get_n_planes())-1 : 0);
 
 	if(state->texture_count<texture_stack.size())
@@ -282,7 +343,9 @@ void Renderer::apply_state()
 		changed &= ~SHADER_DATA;
 	}
 
-	pipeline_state.apply();
+	pipeline_state.set_depth_test(state->depth_test);
+	pipeline_state.set_stencil_test(state->stencil_test);
+	pipeline_state.set_blend(state->blend);
 }
 
 
@@ -302,14 +365,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),
-	winding_test(0),
-	reverse_winding(false),
+	front_face(NON_MANIFOLD),
+	face_cull(NO_CULL),
+	depth_test(0),
+	stencil_test(0),
+	blend(0),
 	object_lod_bias(0)
 { }