Use persistent uniform blocks for Camera, Lighting and Clipping

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

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 2854bc8ff181f3ead7f0f19ec9b0ec56d79b0470..197cf95a5c6b09090adc6ccd5e4505c2a1f44617 100644 (file)
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -64,19 +64,34 @@ public:
        };
 
 private:
-       struct State
+       struct BoundTexture
        {
-               const Camera *camera;
-               Matrix modelview_matrix;
+               Tag tag;
+               mutable int unit;
                const Texture *texture;
                const Sampler *sampler;
-               const Texturing *texturing;
+               int replaced;
+
+               BoundTexture();
+       };
+
+       struct BoundProgramData
+       {
+               const ProgramData *shdata;
+               mutable unsigned generation;
+
+               BoundProgramData(const ProgramData *);
+       };
+
+       struct State
+       {
+               const Camera *camera;
+               Matrix model_matrix;
+               unsigned texture_count;
                unsigned lowest_effect_texunit;
                const Material *material;
                const Lighting *lighting;
-               Matrix lighting_matrix;
                const Clipping *clipping;
-               Matrix clipping_matrix;
                const Program *shprog;
                unsigned shdata_count;
                const VertexSetup *vertex_setup;
@@ -92,15 +107,19 @@ private:
                MATRIX = 2,
                SHADER_DATA = 16,
                MATERIAL_SHDATA = 32,
-               STANDARD_SHDATA = 64
+               STANDARD_SHDATA = 64,
+               CAMERA_SHDATA = 128,
+               LIGHTING_SHDATA = 256,
+               CLIPPING_SHDATA = 512
        };
 
        const Camera *default_camera;
        unsigned char changed;
        std::vector<State> state_stack;
        State *state;
+       std::vector<BoundTexture> texture_stack;
        ProgramData standard_shdata;
-       std::vector<const ProgramData *> shdata_stack;
+       std::vector<BoundProgramData> shdata_stack;
        std::set<const Renderable *> excluded;
 
 public:
@@ -111,24 +130,31 @@ private:
 public:
        ~Renderer();
 
-       /** Sets the camera to render from.  The modelview matrix is reset to the
-       camera's view matrix. */
+       /** Sets the camera to render from.  The model matrix is reset to identity. */
        void set_camera(const Camera &);
 
        const Camera *get_camera() const { return state->camera; }
 
-       /** Replaces the Renderer's modelview matrix. */
+       /** Replaces the Renderer's model matrix. */
        void set_matrix(const Matrix &);
 
-       /** Applies a transform to the Renderer's modelview matrix. */
+       /** Applies a transform to the Renderer's model matrix. */
        void transform(const Matrix &);
 
-       /** Returns the current modelview matrix. */
-       const Matrix &get_matrix() const { return state->modelview_matrix; }
+       /** Returns the current model matrix. */
+       const Matrix &get_matrix() const { return state->model_matrix; }
 
-       void set_texture(const Texture *, const Sampler * = 0);
-       void set_texturing(const Texturing *);
-       unsigned allocate_effect_texunit();
+       void set_texture(Tag, const Texture *, const Sampler * = 0);
+private:
+       void set_texture(Tag, int, const Texture *, const Sampler *);
+       void flush_textures();
+public:
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+       DEPRECATED void set_texture(const Texture *, const Sampler * = 0);
+       DEPRECATED void set_texturing(const Texturing *);
+       DEPRECATED unsigned allocate_effect_texunit();
+#pragma GCC diagnostic pop
        void set_material(const Material *);
 
        void set_lighting(const Lighting *);
@@ -167,7 +193,7 @@ public:
        void exclude(const Renderable &);
        void include(const Renderable &);
 
-       void render(const Renderable &, const Tag & = Tag());
+       void render(const Renderable &, Tag = Tag());
        void draw(const Batch &);
        void draw_instanced(const Batch &, unsigned);