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 603866073c7e81f6edac092d6db169d7c7a98051..197cf95a5c6b09090adc6ccd5e4505c2a1f44617 100644 (file)
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -75,17 +75,23 @@ private:
                BoundTexture();
        };
 
+       struct BoundProgramData
+       {
+               const ProgramData *shdata;
+               mutable unsigned generation;
+
+               BoundProgramData(const ProgramData *);
+       };
+
        struct State
        {
                const Camera *camera;
-               Matrix modelview_matrix;
+               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;
@@ -101,7 +107,10 @@ 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;
@@ -110,7 +119,7 @@ private:
        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:
@@ -121,20 +130,19 @@ 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(Tag, const Texture *, const Sampler * = 0);
 private: