Redesign depth and stencil test and blend state management

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

diff --git a/source/render/renderer.h b/source/render/renderer.h
index b5cbe5bcab7a32b1182f9f2aa90ca6f88c93cb68..23ced9e4fc567bc124a80fefd70b330937f149cc 100644 (file)
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -4,6 +4,7 @@
 #include <set>
 #include <vector>
 #include "matrix.h"
+#include "pipelinestate.h"
 #include "programdata.h"
 #include "tag.h"
 
@@ -92,8 +93,11 @@ private:
                const Program *shprog;
                unsigned shdata_count;
                const VertexSetup *vertex_setup;
-               const WindingTest *winding_test;
-               bool reverse_winding;
+               FaceWinding front_face;
+               CullMode face_cull;
+               const DepthTest *depth_test;
+               const StencilTest *stencil_test;
+               const Blend *blend;
                unsigned object_lod_bias;
 
                State();
@@ -112,6 +116,7 @@ private:
        ProgramData standard_shdata;
        std::vector<BoundProgramData> shdata_stack;
        std::set<const Renderable *> excluded;
+       PipelineState pipeline_state;
 
 public:
        Renderer();
@@ -155,8 +160,12 @@ private:
 
 public:
        void set_vertex_setup(const VertexSetup *);
-       void set_winding_test(const WindingTest *);
-       void set_reverse_winding(bool);
+       void set_front_face(FaceWinding);
+       void set_face_cull(CullMode);
+
+       void set_depth_test(const DepthTest *);
+       void set_stencil_test(const StencilTest *);
+       void set_blend(const Blend *);
 
        void set_object_lod_bias(unsigned);
        unsigned get_object_lod_bias() const { return state->object_lod_bias; }