Support multiple PipelineStates in Renderer

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

diff --git a/source/render/renderer.h b/source/render/renderer.h
index fe13a882430f5407b4175d1aa481f776df86d009..79bd5cd913931a7eeca01f0e79e358b6965fd329 100644 (file)
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -4,6 +4,7 @@
 #include <set>
 #include <vector>
 #include "commands.h"
+#include "cullface.h"
 #include "matrix.h"
 #include "programdata.h"
 #include "renderer_backend.h"
@@ -13,16 +14,20 @@ namespace Msp {
 namespace GL {
 
 class Batch;
+class Blend;
 class Buffer;
 class Camera;
 union ClearValue;
+class DepthTest;
 class Material;
 class Mesh;
 class Lighting;
 class Program;
 class QueryPool;
+struct Rect;
 class Renderable;
 class Sampler;
+class StencilTest;
 class Texture;
 class VertexSetup;
 
@@ -78,6 +83,7 @@ private:
 
        struct State
        {
+               std::uintptr_t pipeline_key = 0;
                const Camera *camera = 0;
                Matrix model_matrix;
                const Framebuffer *framebuffer = 0;
@@ -97,6 +103,7 @@ private:
 
        enum ChangeMask
        {
+               PIPELINE_KEY = 1,
                MATRIX = 2,
                SHADER_DATA = 16
        };
@@ -108,6 +115,8 @@ private:
        ProgramData standard_shdata;
        std::vector<BoundProgramData> shdata_stack;
        std::vector<BoundTexture> texture_stack;
+       const Texture &placeholder_texture;
+       PipelineState *last_pipeline = 0;
        Commands commands;
 
 public:
@@ -134,6 +143,8 @@ private:
        State &get_state() const;
 
 public:
+       void set_pipeline_key(std::uintptr_t);
+
        /** Sets the camera to render from.  The model matrix is reset to identity. */
        void set_camera(const Camera &);
 
@@ -198,6 +209,8 @@ public:
        void end_query(const QueryPool &, unsigned);
 
 private:
+       PipelineState &get_pipeline_state();
+       void apply_framebuffer();
        void apply_state();
 };