Simplify applying texture swizzling

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

diff --git a/source/texture.h b/source/texture.h
index ad41e573ed5d53b409f82794ae44afec96a1a23e..adcfa76b7245276078af013622f343dca8ac65f0 100644 (file)
--- a/source/texture.h
+++ b/source/texture.h
@@ -72,7 +72,6 @@ protected:
        PixelFormat ifmt;
        FormatSwizzle swizzle;
        bool auto_gen_mipmap;
-       mutable int dirty_params;
        Sampler default_sampler;
 
        static int swizzle_orders[];
@@ -87,16 +86,13 @@ protected:
        static DataType get_alloc_type(PixelFormat);
        void set_internal_format(PixelFormat);
        PixelFormat get_upload_format(PixelFormat) const;
+       void apply_swizzle();
+       void set_parameter_i(GLenum, int) const;
 
 public:
        Sampler &get_default_sampler() { return default_sampler; }
        const Sampler &get_default_sampler() const { return default_sampler; }
 
-protected:
-       void update_parameter(int) const;
-       void set_parameter_i(GLenum, int) const;
-       void set_parameter_f(GLenum, float) const;
-public:
        DEPRECATED void set_min_filter(TextureFilter);
        DEPRECATED void set_mag_filter(TextureFilter);