Remove some deprecated stuff that's getting in the way

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

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 69474d4034b03b63bb8b8b20553dc2e91e7e0401..b5cbe5bcab7a32b1182f9f2aa90ca6f88c93cb68 100644 (file)
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -21,7 +21,6 @@ class Program;
 class Renderable;
 class Sampler;
 class Texture;
-class Texturing;
 class VertexSetup;
 class WindingTest;
 
@@ -103,13 +102,9 @@ private:
        enum ChangeMask
        {
                MATRIX = 2,
-               SHADER_DATA = 16,
-               STANDARD_SHDATA = 64,
-               CAMERA_SHDATA = 128,
-               CLIPPING_SHDATA = 512
+               SHADER_DATA = 16
        };
 
-       const Camera *default_camera;
        unsigned char changed;
        std::vector<State> state_stack;
        State *state;
@@ -120,10 +115,6 @@ private:
 
 public:
        Renderer();
-       DEPRECATED Renderer(const Camera *);
-private:
-       void init();
-public:
        ~Renderer();
 
        /** Sets the camera to render from.  The model matrix is reset to identity. */
@@ -142,15 +133,8 @@ public:
 
        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
        DEPRECATED void set_material(const Material *);
 
        DEPRECATED void set_lighting(const Lighting *);
@@ -165,8 +149,11 @@ public:
        Renderer state is popped. */
        void add_shader_data(const ProgramData &data);
 
-       void flush_shader_data();
+       DEPRECATED void flush_shader_data() { flush_shader_data_(); }
+private:
+       void flush_shader_data_();
 
+public:
        void set_vertex_setup(const VertexSetup *);
        void set_winding_test(const WindingTest *);
        void set_reverse_winding(bool);