Some tweaks to vector component handling

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

diff --git a/source/render/renderer.h b/source/render/renderer.h
index a0b4e75fdf2ece24b7e082787258b63238080762..99c8c5002b242da1d18c694d77996ff8ded0607c 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;
 
@@ -64,6 +69,7 @@ private:
                mutable int binding = -1;
                const Texture *texture = 0;
                const Sampler *sampler = 0;
+               int level = -1;
                int replaced = -1;
        };
 
@@ -77,6 +83,7 @@ private:
 
        struct State
        {
+               std::uintptr_t pipeline_key = 0;
                const Camera *camera = 0;
                Matrix model_matrix;
                const Framebuffer *framebuffer = 0;
@@ -96,21 +103,28 @@ private:
 
        enum ChangeMask
        {
+               PIPELINE_KEY = 1,
                MATRIX = 2,
+               CAMERA = 4,
                SHADER_DATA = 16
        };
 
+       unsigned frame_index = 0;
        unsigned char changed = 0;
        std::vector<State> state_stack;
        State *current_state = 0;
        ProgramData standard_shdata;
        std::vector<BoundProgramData> shdata_stack;
        std::vector<BoundTexture> texture_stack;
+       const Texture &placeholder_texture;
+       PipelineState *last_pipeline = 0;
        Commands commands;
 
+       static const Tag world_obj_matrix_tag;
+       static const Tag world_obj_normal_matrix_tag;
+
 public:
        Renderer();
-       ~Renderer();
 
        /** Begins rendering, allowing commands to be issued. */
        void begin();
@@ -119,6 +133,9 @@ public:
        commands are allowed before the next call to begin(). */
        void end();
 
+       using RendererBackend::begin;
+       using RendererBackend::end;
+
        /** Saves the current state so it can be restored later. */
        void push_state();
 
@@ -130,6 +147,16 @@ private:
        State &get_state() const;
 
 public:
+       void set_pipeline_key(std::uintptr_t);
+       void set_pipeline_key(const void *p) { set_pipeline_key(reinterpret_cast<uintptr_t>(p)); }
+
+       template<typename T>
+       void set_pipeline_key(std::uintptr_t k, T d)
+       { set_pipeline_key(k^(static_cast<uintptr_t>(d)<<((sizeof(std::uintptr_t)-sizeof(T))*std::numeric_limits<char>::digits))); }
+
+       template<typename T>
+       void set_pipeline_key(const void *p, T d) { set_pipeline_key(reinterpret_cast<uintptr_t>(p), d); }
+
        /** Sets the camera to render from.  The model matrix is reset to identity. */
        void set_camera(const Camera &);
 
@@ -157,6 +184,7 @@ public:
        void add_shader_data(const ProgramData &data);
 
        void set_texture(Tag, const Texture *, const Sampler * = 0);
+       void set_texture(Tag, const Texture *, int, const Sampler * = 0);
 
 private:
        void flush_shader_data();
@@ -174,7 +202,10 @@ public:
        void set_object_lod_bias(unsigned);
        unsigned get_object_lod_bias() const { return get_state().object_lod_bias; }
 
-       void clear(const ClearValue *);
+       /** Clears framebuffer contents.  If values is not null, it must contain one
+       element for each attachment.  Otherwise the framebuffer contents are
+       discarded and become undefined. */
+       void clear(const ClearValue *values);
 
        /** Draws a batch of primitives.  A shader must be active. */
        void draw(const Batch &);
@@ -190,6 +221,8 @@ public:
        void end_query(const QueryPool &, unsigned);
 
 private:
+       PipelineState &get_pipeline_state();
+       void apply_framebuffer();
        void apply_state();
 };