Remove various old deprecated things

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

diff --git a/source/texture.h b/source/texture.h
index 19da006937cf536aef73bc9ae43e0ba3bc3472b1..3fa29f60603ca66272d306b9cbe35c49e1d0ea27 100644 (file)
--- a/source/texture.h
+++ b/source/texture.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_TEXTURE_H_
 #define MSP_GL_TEXTURE_H_
 
+#include <msp/core/attributes.h>
 #include <msp/datafile/objectloader.h>
 #include <msp/graphics/image.h>
 #include "datatype.h"
@@ -102,7 +103,6 @@ protected:
                WRAP_S = 4,
                WRAP_T = 8,
                WRAP_R = 16,
-               GENERATE_MIPMAP = 32,
                COMPARE = 64,
                COMPARE_FUNC = 128,
                MAX_ANISOTROPY = 256,
@@ -128,7 +128,7 @@ protected:
        TextureWrap wrap_s;
        TextureWrap wrap_t;
        TextureWrap wrap_r;
-       Msp::UInt8 auto_gen_mipmap;
+       bool auto_gen_mipmap;
        bool compare;
        Predicate cmp_func;
        mutable int dirty_params;
@@ -177,7 +177,7 @@ public:
        void set_auto_generate_mipmap(bool);
 
        /// Deprecated.  Use set_auto_generate_mipmap instead.
-       void set_generate_mipmap(bool g) { set_auto_generate_mipmap(g); }
+       DEPRECATED void set_generate_mipmap(bool g) { set_auto_generate_mipmap(g); }
 
        /** Sets depth texture comparison.  Has no effect on other formats.  When
        comparison is enabled, the third component of the texture coordinate is
@@ -202,16 +202,13 @@ public:
        GLenum get_target() const { return target; }
        unsigned get_id() const { return id; }
 
-       void bind(bool legacy = true) const { bind_to(0, legacy); }
-       void bind_to(unsigned, bool = true) const;
+       void bind() const { bind_to(0); }
+       void bind_to(unsigned) const;
 
        static const Texture *current(unsigned = 0);
        static void unbind() { unbind_from(0); }
        static void unbind_from(unsigned);
-private:
-       static bool is_legacy_target(GLenum);
 
-public:
        virtual UInt64 get_data_size() const { return 0; }
 };