Remove deprecated functions from Renderer

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

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 001ec7e1ca11864c172cef70219872de36fdbb6d..36fe6c919a5e063de7b5fa0e74353fe0643b700d 100644 (file)
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -59,7 +59,7 @@ private:
        struct BoundTexture
        {
                Tag tag;
-               mutable int unit = -1;
+               mutable int binding = -1;
                const Texture *texture = 0;
                const Sampler *sampler = 0;
                int replaced = -1;
@@ -134,11 +134,8 @@ public:
        void set_texture(Tag, const Texture *, const Sampler * = 0);
 private:
        void flush_textures();
-public:
-       DEPRECATED void set_material(const Material *);
-
-       DEPRECATED void set_lighting(const Lighting *);
 
+public:
        /** Sets the shader program to use.  As a convenience, uniform values may be
        specified at the same time. */
        void set_shader_program(const Program *prog, const ProgramData *data = 0);
@@ -148,9 +145,8 @@ public:
        last will be used. */
        void add_shader_data(const ProgramData &data);
 
-       DEPRECATED void flush_shader_data() { flush_shader_data_(); }
 private:
-       void flush_shader_data_();
+       void flush_shader_data();
 
 public:
        void set_vertex_setup(const VertexSetup *);