Remove default sampler from Texture

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

diff --git a/source/core/texture.h b/source/core/texture.h
index 4fa20c76483490c724b4f8b6eb72d6d05cd25707..7fb41a622b7b3c7609baea465480603d9b1555f5 100644 (file)
--- a/source/core/texture.h
+++ b/source/core/texture.h
@@ -37,7 +37,6 @@ protected:
        private:
                void init();
 
-               unsigned get_levels() const;
        protected:
                void load_external_image(Graphics::Image &, const std::string &);
 
@@ -45,18 +44,9 @@ protected:
                void external_image(const std::string &);
                void external_image_srgb(const std::string &);
                void external_image_common(const std::string &);
-               void filter(TextureFilter);
                void generate_mipmap(bool);
                void image_data(const std::string &);
-               void mag_filter(TextureFilter);
-               void max_anisotropy(float);
-               void min_filter(TextureFilter);
                void mipmap_levels(unsigned);
-               void sampler();
-               void wrap(TextureWrap);
-               void wrap_r(TextureWrap);
-               void wrap_s(TextureWrap);
-               void wrap_t(TextureWrap);
        };
 
        enum ParameterMask
@@ -79,7 +69,6 @@ protected:
        FormatSwizzle swizzle;
        bool use_srgb_format;
        bool auto_gen_mipmap;
-       Sampler default_sampler;
        std::string debug_name;
 
        static int swizzle_orders[];
@@ -97,27 +86,6 @@ protected:
        void set_parameter_i(GLenum, int) const;
 
 public:
-       Sampler &get_default_sampler() { return default_sampler; }
-       const Sampler &get_default_sampler() const { return default_sampler; }
-
-       DEPRECATED void set_min_filter(TextureFilter);
-       DEPRECATED void set_mag_filter(TextureFilter);
-
-       /** Sets filter for both minification and magnification.  Since mipmapping
-       is not applicable to magnification, LINEAR is used instead. */
-       DEPRECATED void set_filter(TextureFilter);
-
-       DEPRECATED void set_mipmap_levels(unsigned) { }
-
-       DEPRECATED void set_max_anisotropy(float);
-
-       /** Sets the wrapping mode for all coordinates. */
-       DEPRECATED void set_wrap(TextureWrap);
-
-       DEPRECATED void set_wrap_s(TextureWrap);
-       DEPRECATED void set_wrap_t(TextureWrap);
-       DEPRECATED void set_wrap_r(TextureWrap);
-
        static bool can_generate_mipmap();
 
        void generate_mipmap();
@@ -129,15 +97,6 @@ public:
        /// Deprecated.  Use set_auto_generate_mipmap instead.
        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
-       compared against the texel value, and the result is returned as the texture
-       sample. */
-       DEPRECATED void set_compare_enabled(bool);
-
-       /** Sets the function to use for depth comparison. */
-       DEPRECATED void set_compare_func(Predicate);
-
        /// Loads a Graphics::Image from a file and uploads it to the texture.
        virtual void load_image(const std::string &, unsigned = 0);