Support overriding uniforms in inherited Techniques

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

diff --git a/source/texture.h b/source/texture.h
index 1b80e950f08d93e54debd3bdc8b14ae4c7f458ac..9c43b76911ecb5d00fcf517847f6a04001ed6241 100644 (file)
--- a/source/texture.h
+++ b/source/texture.h
@@ -104,12 +104,21 @@ protected:
                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;
@@ -121,6 +130,8 @@ protected:
        Predicate cmp_func;
        mutable int dirty_params;
 
+       static int swizzle_orders[];
+
        Texture(GLenum, ResourceManager * = 0);
        Texture(const Texture &);
        Texture &operator=(const Texture &);
@@ -130,6 +141,7 @@ 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;
@@ -151,6 +163,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);