new MESA_DEBUG option: disassem
[mesa.git] / src / mesa / main / texformat.c
index 01aec5a5bb6aeea0d72e864eead15ac442f8e3fc..3cbc7c88f8dff4d2e9d1defcd7a5a9a00dd77ecd 100644 (file)
@@ -63,6 +63,7 @@
 static void fetch_null_texel( const struct gl_texture_image *texImage,
                              GLint i, GLint j, GLint k, GLchan *texel )
 {
+   (void) texImage; (void) i; (void) j; (void) k;
    texel[RCOMP] = 0;
    texel[GCOMP] = 0;
    texel[BCOMP] = 0;
@@ -73,6 +74,7 @@ static void fetch_null_texel( const struct gl_texture_image *texImage,
 static void fetch_null_texelf( const struct gl_texture_image *texImage,
                                GLint i, GLint j, GLint k, GLfloat *texel )
 {
+   (void) texImage; (void) i; (void) j; (void) k;
    texel[RCOMP] = 0.0;
    texel[GCOMP] = 0.0;
    texel[BCOMP] = 0.0;
@@ -80,6 +82,13 @@ static void fetch_null_texelf( const struct gl_texture_image *texImage,
    _mesa_warning(NULL, "fetch_null_texelf() called!");
 }
 
+static void store_null_texel(struct gl_texture_image *texImage,
+                             GLint i, GLint j, GLint k, const void *texel)
+{
+   /* no-op */
+}
+
+
 
 /***************************************************************/
 /** \name Default GLchan-based formats */
@@ -105,6 +114,7 @@ const struct gl_texture_format _mesa_texformat_rgba = {
    fetch_texel_1d_f_rgba,              /* FetchTexel1Df */
    fetch_texel_2d_f_rgba,              /* FetchTexel2Df */
    fetch_texel_3d_f_rgba,              /* FetchTexel3Df */
+   store_texel_rgba                    /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_rgb = {
@@ -127,6 +137,7 @@ const struct gl_texture_format _mesa_texformat_rgb = {
    fetch_texel_1d_f_rgb,               /* FetchTexel1Df */
    fetch_texel_2d_f_rgb,               /* FetchTexel2Df */
    fetch_texel_3d_f_rgb,               /* FetchTexel3Df */
+   store_texel_rgb                     /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_alpha = {
@@ -149,6 +160,7 @@ const struct gl_texture_format _mesa_texformat_alpha = {
    fetch_texel_1d_f_alpha,             /* FetchTexel1Df */
    fetch_texel_2d_f_alpha,             /* FetchTexel2Df */
    fetch_texel_3d_f_alpha,             /* FetchTexel3Df */
+   store_texel_alpha                   /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_luminance = {
@@ -171,6 +183,7 @@ const struct gl_texture_format _mesa_texformat_luminance = {
    fetch_texel_1d_f_luminance,         /* FetchTexel1Df */
    fetch_texel_2d_f_luminance,         /* FetchTexel2Df */
    fetch_texel_3d_f_luminance,         /* FetchTexel3Df */
+   store_texel_luminance               /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_luminance_alpha = {
@@ -193,6 +206,7 @@ const struct gl_texture_format _mesa_texformat_luminance_alpha = {
    fetch_texel_1d_f_luminance_alpha,   /* FetchTexel1Df */
    fetch_texel_2d_f_luminance_alpha,   /* FetchTexel2Df */
    fetch_texel_3d_f_luminance_alpha,   /* FetchTexel3Df */
+   store_texel_luminance_alpha         /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_intensity = {
@@ -215,6 +229,7 @@ const struct gl_texture_format _mesa_texformat_intensity = {
    fetch_texel_1d_f_intensity,         /* FetchTexel1Df */
    fetch_texel_2d_f_intensity,         /* FetchTexel2Df */
    fetch_texel_3d_f_intensity,         /* FetchTexel3Df */
+   store_texel_intensity               /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_depth_component_float32 = {
@@ -237,6 +252,7 @@ const struct gl_texture_format _mesa_texformat_depth_component_float32 = {
    fetch_texel_1d_f_depth_component_f32,/* FetchTexel1Df */
    fetch_texel_2d_f_depth_component_f32,/* FetchTexel2Df */
    fetch_texel_3d_f_depth_component_f32,/* FetchTexel3Df */
+   store_texel_depth_component_f32     /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_depth_component16 = {
@@ -259,6 +275,7 @@ const struct gl_texture_format _mesa_texformat_depth_component16 = {
    fetch_texel_1d_f_depth_component16, /* FetchTexel1Df */
    fetch_texel_2d_f_depth_component16, /* FetchTexel2Df */
    fetch_texel_3d_f_depth_component16, /* FetchTexel3Df */
+   store_texel_depth_component16       /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_rgba_float32 = {
@@ -281,6 +298,7 @@ const struct gl_texture_format _mesa_texformat_rgba_float32 = {
    fetch_texel_1d_f_rgba_f32,          /* FetchTexel1Df */
    fetch_texel_2d_f_rgba_f32,          /* FetchTexel2Df */
    fetch_texel_3d_f_rgba_f32,          /* FetchTexel3Df */
+   store_texel_rgba_f32                        /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_rgba_float16 = {
@@ -303,6 +321,7 @@ const struct gl_texture_format _mesa_texformat_rgba_float16 = {
    fetch_texel_1d_f_rgba_f16,          /* FetchTexel1Df */
    fetch_texel_2d_f_rgba_f16,          /* FetchTexel2Df */
    fetch_texel_3d_f_rgba_f16,          /* FetchTexel3Df */
+   store_texel_rgba_f16                        /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_rgb_float32 = {
@@ -325,6 +344,7 @@ const struct gl_texture_format _mesa_texformat_rgb_float32 = {
    fetch_texel_1d_f_rgb_f32,           /* FetchTexel1Df */
    fetch_texel_2d_f_rgb_f32,           /* FetchTexel2Df */
    fetch_texel_3d_f_rgb_f32,           /* FetchTexel3Df */
+   store_texel_rgb_f32                 /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_rgb_float16 = {
@@ -346,7 +366,8 @@ const struct gl_texture_format _mesa_texformat_rgb_float16 = {
    fetch_texel_3d_rgb_f16,             /* FetchTexel1D */
    fetch_texel_1d_f_rgb_f16,           /* FetchTexel1Df */
    fetch_texel_2d_f_rgb_f16,           /* FetchTexel2Df */
-   fetch_texel_3d_f_rgb_f16            /* FetchTexel3Df */
+   fetch_texel_3d_f_rgb_f16,           /* FetchTexel3Df */
+   store_texel_rgb_f16                 /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_alpha_float32 = {
@@ -368,7 +389,8 @@ const struct gl_texture_format _mesa_texformat_alpha_float32 = {
    fetch_texel_3d_alpha_f32,           /* FetchTexel1D */
    fetch_texel_1d_f_alpha_f32,         /* FetchTexel1Df */
    fetch_texel_2d_f_alpha_f32,         /* FetchTexel2Df */
-   fetch_texel_3d_f_alpha_f32          /* FetchTexel3Df */
+   fetch_texel_3d_f_alpha_f32,         /* FetchTexel3Df */
+   store_texel_alpha_f32               /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_alpha_float16 = {
@@ -390,7 +412,8 @@ const struct gl_texture_format _mesa_texformat_alpha_float16 = {
    fetch_texel_3d_alpha_f16,           /* FetchTexel1D */
    fetch_texel_1d_f_alpha_f16,         /* FetchTexel1Df */
    fetch_texel_2d_f_alpha_f16,         /* FetchTexel2Df */
-   fetch_texel_3d_f_alpha_f16          /* FetchTexel3Df */
+   fetch_texel_3d_f_alpha_f16,         /* FetchTexel3Df */
+   store_texel_alpha_f16               /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_luminance_float32 = {
@@ -412,7 +435,8 @@ const struct gl_texture_format _mesa_texformat_luminance_float32 = {
    fetch_texel_3d_luminance_f32,       /* FetchTexel3D */
    fetch_texel_1d_f_luminance_f32,     /* FetchTexel1Df */
    fetch_texel_2d_f_luminance_f32,     /* FetchTexel2Df */
-   fetch_texel_3d_f_luminance_f32      /* FetchTexel3Df */
+   fetch_texel_3d_f_luminance_f32,     /* FetchTexel3Df */
+   store_texel_luminance_f32           /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_luminance_float16 = {
@@ -434,7 +458,8 @@ const struct gl_texture_format _mesa_texformat_luminance_float16 = {
    fetch_texel_3d_luminance_f16,       /* FetchTexel3D */
    fetch_texel_1d_f_luminance_f16,     /* FetchTexel1Df */
    fetch_texel_2d_f_luminance_f16,     /* FetchTexel2Df */
-   fetch_texel_3d_f_luminance_f16      /* FetchTexel3Df */
+   fetch_texel_3d_f_luminance_f16,     /* FetchTexel3Df */
+   store_texel_luminance_f16           /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_luminance_alpha_float32 = {
@@ -456,7 +481,8 @@ const struct gl_texture_format _mesa_texformat_luminance_alpha_float32 = {
    fetch_texel_3d_luminance_alpha_f32, /* FetchTexel3D */
    fetch_texel_1d_f_luminance_alpha_f32,/* FetchTexel1Df */
    fetch_texel_2d_f_luminance_alpha_f32,/* FetchTexel2Df */
-   fetch_texel_3d_f_luminance_alpha_f32        /* FetchTexel3Df */
+   fetch_texel_3d_f_luminance_alpha_f32,/* FetchTexel3Df */
+   store_texel_luminance_alpha_f32     /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_luminance_alpha_float16 = {
@@ -478,7 +504,8 @@ const struct gl_texture_format _mesa_texformat_luminance_alpha_float16 = {
    fetch_texel_3d_luminance_alpha_f16, /* FetchTexel3D */
    fetch_texel_1d_f_luminance_alpha_f16,/* FetchTexel1Df */
    fetch_texel_2d_f_luminance_alpha_f16,/* FetchTexel2Df */
-   fetch_texel_3d_f_luminance_alpha_f16        /* FetchTexel3Df */
+   fetch_texel_3d_f_luminance_alpha_f16,/* FetchTexel3Df */
+   store_texel_luminance_alpha_f16     /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_intensity_float32 = {
@@ -500,7 +527,8 @@ const struct gl_texture_format _mesa_texformat_intensity_float32 = {
    fetch_texel_3d_intensity_f32,       /* FetchTexel3D */
    fetch_texel_1d_f_intensity_f32,     /* FetchTexel1Df */
    fetch_texel_2d_f_intensity_f32,     /* FetchTexel2Df */
-   fetch_texel_3d_f_intensity_f32      /* FetchTexel3Df */
+   fetch_texel_3d_f_intensity_f32,     /* FetchTexel3Df */
+   store_texel_intensity_f32           /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_intensity_float16 = {
@@ -522,7 +550,8 @@ const struct gl_texture_format _mesa_texformat_intensity_float16 = {
    fetch_texel_3d_intensity_f16,       /* FetchTexel3D */
    fetch_texel_1d_f_intensity_f16,     /* FetchTexel1Df */
    fetch_texel_2d_f_intensity_f16,     /* FetchTexel2Df */
-   fetch_texel_3d_f_intensity_f16      /* FetchTexel3Df */
+   fetch_texel_3d_f_intensity_f16,     /* FetchTexel3Df */
+   store_texel_intensity_f16           /* StoreTexel */
 };
 
 
@@ -553,10 +582,11 @@ const struct gl_texture_format _mesa_texformat_rgba8888 = {
    fetch_texel_1d_f_rgba8888,          /* FetchTexel1Df */
    fetch_texel_2d_f_rgba8888,          /* FetchTexel2Df */
    fetch_texel_3d_f_rgba8888,          /* FetchTexel3Df */
+   store_texel_rgba8888                        /* StoreTexel */
 };
 
-const struct gl_texture_format _mesa_texformat_abgr8888 = {
-   MESA_FORMAT_ABGR8888,               /* MesaFormat */
+const struct gl_texture_format _mesa_texformat_rgba8888_rev = {
+   MESA_FORMAT_RGBA8888_REV,           /* MesaFormat */
    GL_RGBA,                            /* BaseFormat */
    GL_UNSIGNED_NORMALIZED_ARB,         /* DataType */
    8,                                  /* RedBits */
@@ -568,13 +598,14 @@ const struct gl_texture_format _mesa_texformat_abgr8888 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    4,                                  /* TexelBytes */
-   _mesa_texstore_abgr8888,            /* StoreTexImageFunc */
-   fetch_texel_1d_abgr8888,            /* FetchTexel1D */
-   fetch_texel_2d_abgr8888,            /* FetchTexel2D */
-   fetch_texel_3d_abgr8888,            /* FetchTexel3D */
-   fetch_texel_1d_f_abgr8888,          /* FetchTexel1Df */
-   fetch_texel_2d_f_abgr8888,          /* FetchTexel2Df */
-   fetch_texel_3d_f_abgr8888,          /* FetchTexel3Df */
+   _mesa_texstore_rgba8888,            /* StoreTexImageFunc */
+   fetch_texel_1d_rgba8888_rev,                /* FetchTexel1D */
+   fetch_texel_2d_rgba8888_rev,                /* FetchTexel2D */
+   fetch_texel_3d_rgba8888_rev,                /* FetchTexel3D */
+   fetch_texel_1d_f_rgba8888_rev,      /* FetchTexel1Df */
+   fetch_texel_2d_f_rgba8888_rev,      /* FetchTexel2Df */
+   fetch_texel_3d_f_rgba8888_rev,      /* FetchTexel3Df */
+   store_texel_rgba8888_rev            /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_argb8888 = {
@@ -597,10 +628,11 @@ const struct gl_texture_format _mesa_texformat_argb8888 = {
    fetch_texel_1d_f_argb8888,          /* FetchTexel1Df */
    fetch_texel_2d_f_argb8888,          /* FetchTexel2Df */
    fetch_texel_3d_f_argb8888,          /* FetchTexel3Df */
+   store_texel_argb8888                        /* StoreTexel */
 };
 
-const struct gl_texture_format _mesa_texformat_bgra8888 = {
-   MESA_FORMAT_BGRA8888,               /* MesaFormat */
+const struct gl_texture_format _mesa_texformat_argb8888_rev = {
+   MESA_FORMAT_ARGB8888_REV,           /* MesaFormat */
    GL_RGBA,                            /* BaseFormat */
    GL_UNSIGNED_NORMALIZED_ARB,         /* DataType */
    8,                                  /* RedBits */
@@ -612,13 +644,14 @@ const struct gl_texture_format _mesa_texformat_bgra8888 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    4,                                  /* TexelBytes */
-   _mesa_texstore_bgra8888,            /* StoreTexImageFunc */
-   fetch_texel_1d_bgra8888,            /* FetchTexel1D */
-   fetch_texel_2d_bgra8888,            /* FetchTexel2D */
-   fetch_texel_3d_bgra8888,            /* FetchTexel3D */
-   fetch_texel_1d_f_bgra8888,          /* FetchTexel1Df */
-   fetch_texel_2d_f_bgra8888,          /* FetchTexel2Df */
-   fetch_texel_3d_f_bgra8888,          /* FetchTexel3Df */
+   _mesa_texstore_argb8888,            /* StoreTexImageFunc */
+   fetch_texel_1d_argb8888_rev,                /* FetchTexel1D */
+   fetch_texel_2d_argb8888_rev,                /* FetchTexel2D */
+   fetch_texel_3d_argb8888_rev,                /* FetchTexel3D */
+   fetch_texel_1d_f_argb8888_rev,      /* FetchTexel1Df */
+   fetch_texel_2d_f_argb8888_rev,      /* FetchTexel2Df */
+   fetch_texel_3d_f_argb8888_rev,      /* FetchTexel3Df */
+   store_texel_argb8888_rev            /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_rgb888 = {
@@ -641,6 +674,7 @@ const struct gl_texture_format _mesa_texformat_rgb888 = {
    fetch_texel_1d_f_rgb888,            /* FetchTexel1Df */
    fetch_texel_2d_f_rgb888,            /* FetchTexel2Df */
    fetch_texel_3d_f_rgb888,            /* FetchTexel3Df */
+   store_texel_rgb888                  /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_bgr888 = {
@@ -663,6 +697,7 @@ const struct gl_texture_format _mesa_texformat_bgr888 = {
    fetch_texel_1d_f_bgr888,            /* FetchTexel1Df */
    fetch_texel_2d_f_bgr888,            /* FetchTexel2Df */
    fetch_texel_3d_f_bgr888,            /* FetchTexel3Df */
+   store_texel_bgr888                  /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_rgb565 = {
@@ -685,10 +720,11 @@ const struct gl_texture_format _mesa_texformat_rgb565 = {
    fetch_texel_1d_f_rgb565,            /* FetchTexel1Df */
    fetch_texel_2d_f_rgb565,            /* FetchTexel2Df */
    fetch_texel_3d_f_rgb565,            /* FetchTexel3Df */
+   store_texel_rgb565                  /* StoreTexel */
 };
 
-const struct gl_texture_format _mesa_texformat_bgr565 = {
-   MESA_FORMAT_BGR565,                 /* MesaFormat */
+const struct gl_texture_format _mesa_texformat_rgb565_rev = {
+   MESA_FORMAT_RGB565_REV,             /* MesaFormat */
    GL_RGB,                             /* BaseFormat */
    GL_UNSIGNED_NORMALIZED_ARB,         /* DataType */
    5,                                  /* RedBits */
@@ -700,13 +736,14 @@ const struct gl_texture_format _mesa_texformat_bgr565 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    2,                                  /* TexelBytes */
-   _mesa_texstore_bgr565,              /* StoreTexImageFunc */
-   fetch_texel_1d_bgr565,              /* FetchTexel1D */
-   fetch_texel_2d_bgr565,              /* FetchTexel2D */
-   fetch_texel_3d_bgr565,              /* FetchTexel3D */
-   fetch_texel_1d_f_bgr565,            /* FetchTexel1Df */
-   fetch_texel_2d_f_bgr565,            /* FetchTexel2Df */
-   fetch_texel_3d_f_bgr565,            /* FetchTexel3Df */
+   _mesa_texstore_rgb565,              /* StoreTexImageFunc */
+   fetch_texel_1d_rgb565_rev,          /* FetchTexel1D */
+   fetch_texel_2d_rgb565_rev,          /* FetchTexel2D */
+   fetch_texel_3d_rgb565_rev,          /* FetchTexel3D */
+   fetch_texel_1d_f_rgb565_rev,                /* FetchTexel1Df */
+   fetch_texel_2d_f_rgb565_rev,                /* FetchTexel2Df */
+   fetch_texel_3d_f_rgb565_rev,                /* FetchTexel3Df */
+   store_texel_rgb565_rev              /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_argb4444 = {
@@ -729,10 +766,11 @@ const struct gl_texture_format _mesa_texformat_argb4444 = {
    fetch_texel_1d_f_argb4444,          /* FetchTexel1Df */
    fetch_texel_2d_f_argb4444,          /* FetchTexel2Df */
    fetch_texel_3d_f_argb4444,          /* FetchTexel3Df */
+   store_texel_argb4444                        /* StoreTexel */
 };
 
-const struct gl_texture_format _mesa_texformat_bgra4444 = {
-   MESA_FORMAT_BGRA4444,               /* MesaFormat */
+const struct gl_texture_format _mesa_texformat_argb4444_rev = {
+   MESA_FORMAT_ARGB4444_REV,           /* MesaFormat */
    GL_RGBA,                            /* BaseFormat */
    GL_UNSIGNED_NORMALIZED_ARB,         /* DataType */
    4,                                  /* RedBits */
@@ -744,13 +782,14 @@ const struct gl_texture_format _mesa_texformat_bgra4444 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    2,                                  /* TexelBytes */
-   _mesa_texstore_bgra4444,            /* StoreTexImageFunc */
-   fetch_texel_1d_bgra4444,            /* FetchTexel1D */
-   fetch_texel_2d_bgra4444,            /* FetchTexel2D */
-   fetch_texel_3d_bgra4444,            /* FetchTexel3D */
-   fetch_texel_1d_f_bgra4444,          /* FetchTexel1Df */
-   fetch_texel_2d_f_bgra4444,          /* FetchTexel2Df */
-   fetch_texel_3d_f_bgra4444,          /* FetchTexel3Df */
+   _mesa_texstore_argb4444,            /* StoreTexImageFunc */
+   fetch_texel_1d_argb4444_rev,                /* FetchTexel1D */
+   fetch_texel_2d_argb4444_rev,                /* FetchTexel2D */
+   fetch_texel_3d_argb4444_rev,                /* FetchTexel3D */
+   fetch_texel_1d_f_argb4444_rev,      /* FetchTexel1Df */
+   fetch_texel_2d_f_argb4444_rev,      /* FetchTexel2Df */
+   fetch_texel_3d_f_argb4444_rev,      /* FetchTexel3Df */
+   store_texel_argb4444_rev            /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_argb1555 = {
@@ -773,10 +812,11 @@ const struct gl_texture_format _mesa_texformat_argb1555 = {
    fetch_texel_1d_f_argb1555,          /* FetchTexel1Df */
    fetch_texel_2d_f_argb1555,          /* FetchTexel2Df */
    fetch_texel_3d_f_argb1555,          /* FetchTexel3Df */
+   store_texel_argb1555                        /* StoreTexel */
 };
 
-const struct gl_texture_format _mesa_texformat_bgra5551 = {
-   MESA_FORMAT_BGRA5551,               /* MesaFormat */
+const struct gl_texture_format _mesa_texformat_argb1555_rev = {
+   MESA_FORMAT_ARGB1555_REV,           /* MesaFormat */
    GL_RGBA,                            /* BaseFormat */
    GL_UNSIGNED_NORMALIZED_ARB,         /* DataType */
    5,                                  /* RedBits */
@@ -788,13 +828,14 @@ const struct gl_texture_format _mesa_texformat_bgra5551 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    2,                                  /* TexelBytes */
-   _mesa_texstore_bgra5551,            /* StoreTexImageFunc */
-   fetch_texel_1d_bgra5551,            /* FetchTexel1D */
-   fetch_texel_2d_bgra5551,            /* FetchTexel2D */
-   fetch_texel_3d_bgra5551,            /* FetchTexel3D */
-   fetch_texel_1d_f_bgra5551,          /* FetchTexel1Df */
-   fetch_texel_2d_f_bgra5551,          /* FetchTexel2Df */
-   fetch_texel_3d_f_bgra5551,          /* FetchTexel3Df */
+   _mesa_texstore_argb1555,            /* StoreTexImageFunc */
+   fetch_texel_1d_argb1555_rev,                /* FetchTexel1D */
+   fetch_texel_2d_argb1555_rev,                /* FetchTexel2D */
+   fetch_texel_3d_argb1555_rev,                /* FetchTexel3D */
+   fetch_texel_1d_f_argb1555_rev,      /* FetchTexel1Df */
+   fetch_texel_2d_f_argb1555_rev,      /* FetchTexel2Df */
+   fetch_texel_3d_f_argb1555_rev,      /* FetchTexel3Df */
+   store_texel_argb1555_rev            /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_al88 = {
@@ -817,10 +858,11 @@ const struct gl_texture_format _mesa_texformat_al88 = {
    fetch_texel_1d_f_al88,              /* FetchTexel1Df */
    fetch_texel_2d_f_al88,              /* FetchTexel2Df */
    fetch_texel_3d_f_al88,              /* FetchTexel3Df */
+   store_texel_al88                    /* StoreTexel */
 };
 
-const struct gl_texture_format _mesa_texformat_la88 = {
-   MESA_FORMAT_LA88,                   /* MesaFormat */
+const struct gl_texture_format _mesa_texformat_al88_rev = {
+   MESA_FORMAT_AL88_REV,               /* MesaFormat */
    GL_LUMINANCE_ALPHA,                 /* BaseFormat */
    GL_UNSIGNED_NORMALIZED_ARB,         /* DataType */
    0,                                  /* RedBits */
@@ -832,13 +874,14 @@ const struct gl_texture_format _mesa_texformat_la88 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    2,                                  /* TexelBytes */
-   _mesa_texstore_la88,                        /* StoreTexImageFunc */
-   fetch_texel_1d_la88,                        /* FetchTexel1D */
-   fetch_texel_2d_la88,                        /* FetchTexel2D */
-   fetch_texel_3d_la88,                        /* FetchTexel3D */
-   fetch_texel_1d_f_la88,              /* FetchTexel1Df */
-   fetch_texel_2d_f_la88,              /* FetchTexel2Df */
-   fetch_texel_3d_f_la88,              /* FetchTexel3Df */
+   _mesa_texstore_al88,                        /* StoreTexImageFunc */
+   fetch_texel_1d_al88_rev,            /* FetchTexel1D */
+   fetch_texel_2d_al88_rev,            /* FetchTexel2D */
+   fetch_texel_3d_al88_rev,            /* FetchTexel3D */
+   fetch_texel_1d_f_al88_rev,          /* FetchTexel1Df */
+   fetch_texel_2d_f_al88_rev,          /* FetchTexel2Df */
+   fetch_texel_3d_f_al88_rev,          /* FetchTexel3Df */
+   store_texel_al88_rev                        /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_rgb332 = {
@@ -861,6 +904,7 @@ const struct gl_texture_format _mesa_texformat_rgb332 = {
    fetch_texel_1d_f_rgb332,            /* FetchTexel1Df */
    fetch_texel_2d_f_rgb332,            /* FetchTexel2Df */
    fetch_texel_3d_f_rgb332,            /* FetchTexel3Df */
+   store_texel_rgb332                  /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_a8 = {
@@ -883,6 +927,7 @@ const struct gl_texture_format _mesa_texformat_a8 = {
    fetch_texel_1d_f_a8,                        /* FetchTexel1Df */
    fetch_texel_2d_f_a8,                        /* FetchTexel2Df */
    fetch_texel_3d_f_a8,                        /* FetchTexel3Df */
+   store_texel_a8                      /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_l8 = {
@@ -905,6 +950,7 @@ const struct gl_texture_format _mesa_texformat_l8 = {
    fetch_texel_1d_f_l8,                        /* FetchTexel1Df */
    fetch_texel_2d_f_l8,                        /* FetchTexel2Df */
    fetch_texel_3d_f_l8,                        /* FetchTexel3Df */
+   store_texel_l8                      /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_i8 = {
@@ -927,6 +973,7 @@ const struct gl_texture_format _mesa_texformat_i8 = {
    fetch_texel_1d_f_i8,                        /* FetchTexel1Df */
    fetch_texel_2d_f_i8,                        /* FetchTexel2Df */
    fetch_texel_3d_f_i8,                        /* FetchTexel3Df */
+   store_texel_i8                      /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_ci8 = {
@@ -949,6 +996,7 @@ const struct gl_texture_format _mesa_texformat_ci8 = {
    fetch_texel_1d_f_ci8,               /* FetchTexel1Df */
    fetch_texel_2d_f_ci8,               /* FetchTexel2Df */
    fetch_texel_3d_f_ci8,               /* FetchTexel3Df */
+   store_texel_ci8                     /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_ycbcr = {
@@ -971,6 +1019,7 @@ const struct gl_texture_format _mesa_texformat_ycbcr = {
    fetch_texel_1d_f_ycbcr,             /* FetchTexel1Df */
    fetch_texel_2d_f_ycbcr,             /* FetchTexel2Df */
    fetch_texel_3d_f_ycbcr,             /* FetchTexel3Df */
+   store_texel_ycbcr                   /* StoreTexel */
 };
 
 const struct gl_texture_format _mesa_texformat_ycbcr_rev = {
@@ -993,6 +1042,7 @@ const struct gl_texture_format _mesa_texformat_ycbcr_rev = {
    fetch_texel_1d_f_ycbcr_rev,         /* FetchTexel1Df */
    fetch_texel_2d_f_ycbcr_rev,         /* FetchTexel2Df */
    fetch_texel_3d_f_ycbcr_rev,         /* FetchTexel3Df */
+   store_texel_ycbcr_rev               /* StoreTexel */
 };
 
 /*@}*/
@@ -1022,6 +1072,7 @@ const struct gl_texture_format _mesa_null_texformat = {
    fetch_null_texelf,                  /* FetchTexel1Df */
    fetch_null_texelf,                  /* FetchTexel2Df */
    fetch_null_texelf,                  /* FetchTexel3Df */
+   store_null_texel                    /* StoreTexel */
 };
 
 /*@}*/
@@ -1062,20 +1113,23 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
       case GL_RGB5_A1:
          return &_mesa_texformat_argb1555;
       case GL_RGBA2:
+         return &_mesa_texformat_argb4444_rev; /* just to test another format*/
       case GL_RGBA4:
          return &_mesa_texformat_argb4444;
 
       /* RGB formats */
       case 3:
       case GL_RGB:
-      case GL_RGB8:
       case GL_RGB10:
       case GL_RGB12:
       case GL_RGB16:
          return &_mesa_texformat_rgb;
+      case GL_RGB8:
+         return &_mesa_texformat_rgb888;
       case GL_R3_G3_B2:
          return &_mesa_texformat_rgb332;
       case GL_RGB4:
+         return &_mesa_texformat_rgb565_rev; /* just to test another format */
       case GL_RGB5:
          return &_mesa_texformat_rgb565;