Check for armature mismatches in Animation

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

diff --git a/source/texture.h b/source/texture.h
index 23f3bb2539ab5f9e9c544ccb00b73cc601e48f35..94614c45c7319748c102456dcd6c1b3bb6119649 100644 (file)
--- a/source/texture.h
+++ b/source/texture.h
@@ -88,6 +88,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);
@@ -104,13 +105,25 @@ protected:
                GENERATE_MIPMAP = 32,
                COMPARE = 64,
                COMPARE_FUNC = 128,
-               MAX_ANISOTROPY = 256
+               MAX_ANISOTROPY = 256,
+               FORMAT_SWIZZLE = 512,
+               MIPMAP_LEVELS = 1024
+       };
+
+       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;
+       unsigned mipmap_levels;
        float max_anisotropy;
        TextureWrap wrap_s;
        TextureWrap wrap_t;
@@ -120,6 +133,8 @@ protected:
        Predicate cmp_func;
        mutable int dirty_params;
 
+       static int swizzle_orders[];
+
        Texture(GLenum, ResourceManager * = 0);
        Texture(const Texture &);
        Texture &operator=(const Texture &);
@@ -128,8 +143,12 @@ 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;
+       void set_parameter_f(GLenum, float) const;
 public:
        void set_min_filter(TextureFilter);
        void set_mag_filter(TextureFilter);
@@ -138,6 +157,8 @@ public:
        is not applicable to magnification, LINEAR is used instead. */
        void set_filter(TextureFilter);
 
+       void set_mipmap_levels(unsigned);
+
        void set_max_anisotropy(float);
 
        /** Sets the wrapping mode for all coordinates. */
@@ -147,6 +168,8 @@ public:
        void set_wrap_t(TextureWrap);
        void set_wrap_r(TextureWrap);
 
+       static bool can_generate_mipmap();
+
        /** Sets automatic mipmap generation.  If enabled, mipmaps are generated
        when a texture image is uploaded. */
        void set_generate_mipmap(bool);
@@ -178,13 +201,16 @@ public:
        GLenum get_target() const { return target; }
        unsigned get_id() const { return id; }
 
-       void bind() const { bind_to(0); }
-       void bind_to(unsigned) const;
+       void bind(bool legacy = true) const { bind_to(0, legacy); }
+       void bind_to(unsigned, bool = true) 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; }
 };