Copy ProgramData::uniform_slots in copy constructor and operator=

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

diff --git a/source/renderer.h b/source/renderer.h
index f736447e12fce15c7bf9555cd9be7333cd01b2ae..5d8f686e35806a419e4a46167fd75161666ed725 100644 (file)
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -65,6 +65,7 @@ private:
        {
                const Texture *texture;
                const Texturing *texturing;
+               unsigned lowest_effect_texunit;
                const Material *material;
                const Lighting *lighting;
                Matrix lighting_matrix;
@@ -90,6 +91,7 @@ private:
 
        MtxStack mtx_stack;
        bool mtx_changed;
+       bool matrices_loaded;
        const Camera *camera;
        std::vector<State> state_stack;
        State *state;
@@ -110,6 +112,7 @@ public:
 
        void set_texture(const Texture *);
        void set_texturing(const Texturing *);
+       unsigned allocate_effect_texunit();
        void set_material(const Material *);
 
        void set_lighting(const Lighting *);
@@ -137,9 +140,13 @@ public:
 
        /** Prepares for temporarily bypassing the Renderer by synchronizing the
        current state with GL.  No additional call is necessary to resume using the
-       Renderer. */
+       Renderer.  DEPRECATED. */
        void escape();
 
+       /** Ends rendering, unbinding all objects and resetting state.  There must
+       be no unpopped state in the stack. */
+       void end();
+
        void exclude(const Renderable &);
        void include(const Renderable &);