Deprecate the mipmap_levels parameter in Texture

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

diff --git a/source/texture.h b/source/texture.h
index f1a51767f577771477289c582375ab2170c98c11..8aac05927288cfcbcdb8253230f8df97829f6c82 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"
@@ -73,6 +74,7 @@ protected:
        class Loader: public DataFile::CollectionObjectLoader<Texture>
        {
        protected:
+               unsigned levels;
                bool srgb;
 
        public:
@@ -88,6 +90,7 @@ protected:
                void mag_filter(TextureFilter);
                void max_anisotropy(float);
                void min_filter(TextureFilter);
+               void mipmap_levels(unsigned);
                void wrap(TextureWrap);
                void wrap_r(TextureWrap);
                void wrap_s(TextureWrap);
@@ -101,25 +104,36 @@ protected:
                WRAP_S = 4,
                WRAP_T = 8,
                WRAP_R = 16,
-               GENERATE_MIPMAP = 32,
                COMPARE = 64,
                COMPARE_FUNC = 128,
-               MAX_ANISOTROPY = 256
+               MAX_ANISOTROPY = 256,
+               FORMAT_SWIZZLE = 512
+       };
+
+       enum FormatSwizzle
+       {
+               NO_SWIZZLE,
+               R_TO_LUMINANCE,
+               RG_TO_LUMINANCE_ALPHA
        };
 
        unsigned id;
        GLenum target;
+       PixelFormat ifmt;
+       FormatSwizzle swizzle;
        TextureFilter min_filter;
        TextureFilter mag_filter;
        float max_anisotropy;
        TextureWrap wrap_s;
        TextureWrap wrap_t;
        TextureWrap wrap_r;
-       bool gen_mipmap;
+       bool auto_gen_mipmap;
        bool compare;
        Predicate cmp_func;
        mutable int dirty_params;
 
+       static int swizzle_orders[];
+
        Texture(GLenum, ResourceManager * = 0);
        Texture(const Texture &);
        Texture &operator=(const Texture &);
@@ -128,6 +142,8 @@ public:
 
 protected:
        static DataType get_alloc_type(PixelFormat);
+       void set_internal_format(PixelFormat);
+       PixelFormat get_upload_format(PixelFormat) const;
 
        void update_parameter(int) const;
        void set_parameter_i(GLenum, int) const;
@@ -140,6 +156,8 @@ public:
        is not applicable to magnification, LINEAR is used instead. */
        void set_filter(TextureFilter);
 
+       DEPRECATED void set_mipmap_levels(unsigned) { }
+
        void set_max_anisotropy(float);
 
        /** Sets the wrapping mode for all coordinates. */
@@ -149,14 +167,17 @@ public:
        void set_wrap_t(TextureWrap);
        void set_wrap_r(TextureWrap);
 
+       static bool can_generate_mipmap();
+
+       void generate_mipmap();
+
        /** Sets automatic mipmap generation.  If enabled, mipmaps are generated
        when a texture image is uploaded. */
-       void set_generate_mipmap(bool);
+       void set_auto_generate_mipmap(bool);
 
-protected:
-       void auto_generate_mipmap();
+       /// Deprecated.  Use set_auto_generate_mipmap instead.
+       DEPRECATED void set_generate_mipmap(bool g) { set_auto_generate_mipmap(g); }
 
-public:
        /** 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
@@ -169,13 +190,17 @@ public:
        /// Loads a Graphics::Image from a file and uploads it to the texture.
        virtual void load_image(const std::string &, bool srgb = false);
 
+       virtual void load_image(const std::string &, unsigned, bool srgb = false);
+
        /** Uploads an image to the texture.  If storage has not been defined, it
        will be set to match the image.  Otherwise the image must be compatible
        with the defined storage.  Semantics depend on the type of texture.
 
        If srgb is true and storage is determined by this call, then an sRGB pixel
        format will be used. */
-       virtual void image(const Graphics::Image &, bool srgb = false) = 0;
+       virtual void image(const Graphics::Image &, bool srgb = false);
+
+       virtual void image(const Graphics::Image &, unsigned, bool srgb = false) = 0;
 
        GLenum get_target() const { return target; }
        unsigned get_id() const { return id; }