Redesign depth and stencil test and blend state management

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

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 4acf3deda9dded4cabc903e5bfc42d718f0c2f3d..68b7927dcb7067c0e3331c33f3f09bab1bf6a04a 100644 (file)
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -15,7 +15,6 @@
 #include "texture.h"
 #include "vertexarray.h"
 #include "vertexsetup.h"
-#include "windingtest.h"
 
 using namespace std;
 
@@ -152,14 +151,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->winding_test = w;
+       state->front_face = winding;
 }
 
-void Renderer::set_reverse_winding(bool r)
+void Renderer::set_face_cull(CullMode cull)
 {
-       state->reverse_winding = r;
+       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)
@@ -252,7 +266,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,6 +297,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();
 }
 
@@ -308,8 +327,11 @@ Renderer::State::State():
        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)
 { }