Imported the Savage DRI driver from the savage-2-0-0-branch of DRI CVS
[mesa.git] / src / mesa / main / texformat.c
index 739df30346c3adafd926814ab0e9f9053dc1f611..7222b77eb597608f225e27462c40aef516f01027 100644 (file)
@@ -1,10 +1,15 @@
-/* $Id: texformat.c,v 1.8 2001/04/04 21:54:21 brianp Exp $ */
+/**
+ * \file texformat.c
+ * Texture formats.
+ *
+ * \author Gareth Hughes
+ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  5.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Author:
- *    Gareth Hughes <gareth@valinux.com>
  */
 
-#ifdef PC_HEADER
-#include "all.h"
-#else
+
 #include "glheader.h"
 #include "colormac.h"
 #include "context.h"
 #include "image.h"
-#include "mem.h"
-#include "mmath.h"
+#include "imports.h"
 #include "mtypes.h"
 #include "texformat.h"
 #include "teximage.h"
 #include "texstate.h"
-#include "swrast/s_span.h"
-#endif
 
 
-/* Texel fetch routines for all supported formats:
+/* Texel fetch routines for all supported formats
  */
 #define DIM 1
 #include "texformat_tmp.h"
 #define DIM 3
 #include "texformat_tmp.h"
 
-/* Have to have this so the FetchTexel function pointer is never NULL.
+/**
+ * Null texel fetch function.
+ *
+ * Have to have this so the FetchTexel function pointer is never NULL.
  */
 static void fetch_null_texel( const struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, GLvoid *texel )
+                             GLint i, GLint j, GLint k, GLchan *texel )
+{
+   texel[RCOMP] = 0;
+   texel[GCOMP] = 0;
+   texel[BCOMP] = 0;
+   texel[ACOMP] = 0;
+   _mesa_warning(NULL, "fetch_null_texel() called!");
+}
+
+static void fetch_null_texelf( const struct gl_texture_image *texImage,
+                               GLint i, GLint j, GLint k, GLfloat *texel )
 {
-   GLchan *rgba = (GLchan *) texel;
-   rgba[RCOMP] = 0;
-   rgba[GCOMP] = 0;
-   rgba[BCOMP] = 0;
-   rgba[ACOMP] = 0;
+   texel[RCOMP] = 0.0;
+   texel[GCOMP] = 0.0;
+   texel[BCOMP] = 0.0;
+   texel[ACOMP] = 0.0;
+   _mesa_warning(NULL, "fetch_null_texelf() called!");
 }
 
 
-/* =============================================================
- * Default GLchan-based formats:
- */
+/***************************************************************/
+/** \name Default GLchan-based formats */
+/*@{*/
 
 const struct gl_texture_format _mesa_texformat_rgba = {
    MESA_FORMAT_RGBA,                   /* MesaFormat */
-   GL_RGBA,                            /* IntFormat */
-   CHAN_TYPE,                          /* Type */
+   GL_RGBA,                            /* BaseFormat */
    CHAN_BITS,                          /* RedBits */
    CHAN_BITS,                          /* GreenBits */
    CHAN_BITS,                          /* BlueBits */
@@ -85,15 +94,17 @@ const struct gl_texture_format _mesa_texformat_rgba = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    4 * CHAN_BITS / 8,                  /* TexelBytes */
-   fetch_1d_texel_rgba,                        /* FetchTexel1D */
-   fetch_2d_texel_rgba,                        /* FetchTexel2D */
-   fetch_3d_texel_rgba,                        /* FetchTexel3D */
+   fetch_texel_1d_rgba,                        /* FetchTexel1D */
+   fetch_texel_2d_rgba,                        /* FetchTexel2D */
+   fetch_texel_3d_rgba,                        /* FetchTexel3D */
+   fetch_texel_1d_f_rgba,              /* FetchTexel1Df */
+   fetch_texel_2d_f_rgba,              /* FetchTexel2Df */
+   fetch_texel_3d_f_rgba,              /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_rgb = {
    MESA_FORMAT_RGB,                    /* MesaFormat */
-   GL_RGB,                             /* IntFormat */
-   CHAN_TYPE,                          /* Type */
+   GL_RGB,                             /* BaseFormat */
    CHAN_BITS,                          /* RedBits */
    CHAN_BITS,                          /* GreenBits */
    CHAN_BITS,                          /* BlueBits */
@@ -103,15 +114,17 @@ const struct gl_texture_format _mesa_texformat_rgb = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    3 * CHAN_BITS / 8,                  /* TexelBytes */
-   fetch_1d_texel_rgb,                 /* FetchTexel1D */
-   fetch_2d_texel_rgb,                 /* FetchTexel2D */
-   fetch_3d_texel_rgb,                 /* FetchTexel3D */
+   fetch_texel_1d_rgb,                 /* FetchTexel1D */
+   fetch_texel_2d_rgb,                 /* FetchTexel2D */
+   fetch_texel_3d_rgb,                 /* FetchTexel3D */
+   fetch_texel_1d_f_rgb,               /* FetchTexel1Df */
+   fetch_texel_2d_f_rgb,               /* FetchTexel2Df */
+   fetch_texel_3d_f_rgb,               /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_alpha = {
    MESA_FORMAT_ALPHA,                  /* MesaFormat */
-   GL_ALPHA,                           /* IntFormat */
-   CHAN_TYPE,                          /* Type */
+   GL_ALPHA,                           /* BaseFormat */
    0,                                  /* RedBits */
    0,                                  /* GreenBits */
    0,                                  /* BlueBits */
@@ -121,15 +134,17 @@ const struct gl_texture_format _mesa_texformat_alpha = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    CHAN_BITS / 8,                      /* TexelBytes */
-   fetch_1d_texel_alpha,               /* FetchTexel1D */
-   fetch_2d_texel_alpha,               /* FetchTexel2D */
-   fetch_3d_texel_alpha,               /* FetchTexel3D */
+   fetch_texel_1d_alpha,               /* FetchTexel1D */
+   fetch_texel_2d_alpha,               /* FetchTexel2D */
+   fetch_texel_3d_alpha,               /* FetchTexel3D */
+   fetch_texel_1d_f_alpha,             /* FetchTexel1Df */
+   fetch_texel_2d_f_alpha,             /* FetchTexel2Df */
+   fetch_texel_3d_f_alpha,             /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_luminance = {
    MESA_FORMAT_LUMINANCE,              /* MesaFormat */
-   GL_LUMINANCE,                       /* IntFormat */
-   CHAN_TYPE,                          /* Type */
+   GL_LUMINANCE,                       /* BaseFormat */
    0,                                  /* RedBits */
    0,                                  /* GreenBits */
    0,                                  /* BlueBits */
@@ -139,15 +154,17 @@ const struct gl_texture_format _mesa_texformat_luminance = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    CHAN_BITS / 8,                      /* TexelBytes */
-   fetch_1d_texel_luminance,           /* FetchTexel1D */
-   fetch_2d_texel_luminance,           /* FetchTexel2D */
-   fetch_3d_texel_luminance,           /* FetchTexel3D */
+   fetch_texel_1d_luminance,           /* FetchTexel1D */
+   fetch_texel_2d_luminance,           /* FetchTexel2D */
+   fetch_texel_3d_luminance,           /* FetchTexel3D */
+   fetch_texel_1d_f_luminance,         /* FetchTexel1Df */
+   fetch_texel_2d_f_luminance,         /* FetchTexel2Df */
+   fetch_texel_3d_f_luminance,         /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_luminance_alpha = {
    MESA_FORMAT_LUMINANCE_ALPHA,                /* MesaFormat */
-   GL_LUMINANCE_ALPHA,                 /* IntFormat */
-   CHAN_TYPE,                          /* Type */
+   GL_LUMINANCE_ALPHA,                 /* BaseFormat */
    0,                                  /* RedBits */
    0,                                  /* GreenBits */
    0,                                  /* BlueBits */
@@ -157,15 +174,17 @@ const struct gl_texture_format _mesa_texformat_luminance_alpha = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    2 * CHAN_BITS / 8,                  /* TexelBytes */
-   fetch_1d_texel_luminance_alpha,     /* FetchTexel1D */
-   fetch_2d_texel_luminance_alpha,     /* FetchTexel2D */
-   fetch_3d_texel_luminance_alpha,     /* FetchTexel3D */
+   fetch_texel_1d_luminance_alpha,     /* FetchTexel1D */
+   fetch_texel_2d_luminance_alpha,     /* FetchTexel2D */
+   fetch_texel_3d_luminance_alpha,     /* FetchTexel3D */
+   fetch_texel_1d_f_luminance_alpha,   /* FetchTexel1Df */
+   fetch_texel_2d_f_luminance_alpha,   /* FetchTexel2Df */
+   fetch_texel_3d_f_luminance_alpha,   /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_intensity = {
    MESA_FORMAT_INTENSITY,              /* MesaFormat */
-   GL_INTENSITY,                       /* IntFormat */
-   CHAN_TYPE,                          /* Type */
+   GL_INTENSITY,                       /* BaseFormat */
    0,                                  /* RedBits */
    0,                                  /* GreenBits */
    0,                                  /* BlueBits */
@@ -175,15 +194,17 @@ const struct gl_texture_format _mesa_texformat_intensity = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    CHAN_BITS / 8,                      /* TexelBytes */
-   fetch_1d_texel_intensity,           /* FetchTexel1D */
-   fetch_2d_texel_intensity,           /* FetchTexel2D */
-   fetch_3d_texel_intensity,           /* FetchTexel3D */
+   fetch_texel_1d_intensity,           /* FetchTexel1D */
+   fetch_texel_2d_intensity,           /* FetchTexel2D */
+   fetch_texel_3d_intensity,           /* FetchTexel3D */
+   fetch_texel_1d_f_intensity,         /* FetchTexel1Df */
+   fetch_texel_2d_f_intensity,         /* FetchTexel2Df */
+   fetch_texel_3d_f_intensity,         /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_color_index = {
    MESA_FORMAT_COLOR_INDEX,            /* MesaFormat */
-   GL_COLOR_INDEX,                     /* IntFormat */
-   CHAN_TYPE,                          /* Type */
+   GL_COLOR_INDEX,                     /* BaseFormat */
    0,                                  /* RedBits */
    0,                                  /* GreenBits */
    0,                                  /* BlueBits */
@@ -193,15 +214,18 @@ const struct gl_texture_format _mesa_texformat_color_index = {
    CHAN_BITS,                          /* IndexBits */
    0,                                  /* DepthBits */
    CHAN_BITS / 8,                      /* TexelBytes */
-   fetch_1d_texel_color_index,         /* FetchTexel1D */
-   fetch_2d_texel_color_index,         /* FetchTexel2D */
-   fetch_3d_texel_color_index,         /* FetchTexel3D */
+   fetch_texel_1d_color_index,         /* FetchTexel1D */
+   fetch_texel_2d_color_index,         /* FetchTexel2D */
+   fetch_texel_3d_color_index,         /* FetchTexel3D */
+   fetch_texel_1d_f_color_index,       /* FetchTexel1Df */
+   fetch_texel_2d_f_color_index,       /* FetchTexel2Df */
+   fetch_texel_3d_f_color_index,       /* FetchTexel3Df */
 };
 
+/* XXX someday implement 16, 24 and 32-bit integer depth images */
 const struct gl_texture_format _mesa_texformat_depth_component = {
    MESA_FORMAT_DEPTH_COMPONENT,                /* MesaFormat */
-   GL_DEPTH_COMPONENT,                 /* IntFormat */
-   GL_FLOAT,                           /* Type */
+   GL_DEPTH_COMPONENT,                 /* BaseFormat */
    0,                                  /* RedBits */
    0,                                  /* GreenBits */
    0,                                  /* BlueBits */
@@ -211,20 +235,105 @@ const struct gl_texture_format _mesa_texformat_depth_component = {
    0,                                  /* IndexBits */
    sizeof(GLfloat) * 8,                        /* DepthBits */
    sizeof(GLfloat),                    /* TexelBytes */
-   fetch_1d_texel_depth_component,     /* FetchTexel1D */
-   fetch_2d_texel_depth_component,     /* FetchTexel2D */
-   fetch_3d_texel_depth_component,     /* FetchTexel3D */
+   fetch_null_texel,                   /* FetchTexel1D */
+   fetch_null_texel,                   /* FetchTexel1D */
+   fetch_null_texel,                   /* FetchTexel1D */
+   fetch_texel_1d_f_depth_component,   /* FetchTexel1Df */
+   fetch_texel_2d_f_depth_component,   /* FetchTexel2Df */
+   fetch_texel_3d_f_depth_component,   /* FetchTexel3Df */
+};
+
+const struct gl_texture_format _mesa_texformat_rgba_float32 = {
+   MESA_FORMAT_RGBA_FLOAT32,           /* MesaFormat */
+   GL_RGBA,                            /* BaseFormat */
+   8 * sizeof(GLfloat),                        /* RedBits */
+   8 * sizeof(GLfloat),                        /* GreenBits */
+   8 * sizeof(GLfloat),                        /* BlueBits */
+   8 * sizeof(GLfloat),                        /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   4 * sizeof(GLfloat),                        /* TexelBytes */
+   fetch_null_texel,                   /* FetchTexel1D */
+   fetch_null_texel,                   /* FetchTexel1D */
+   fetch_null_texel,                   /* FetchTexel1D */
+   fetch_texel_1d_f_rgba_f32,          /* FetchTexel1Df */
+   fetch_texel_2d_f_rgba_f32,          /* FetchTexel2Df */
+   fetch_texel_3d_f_rgba_f32,          /* FetchTexel3Df */
 };
 
+const struct gl_texture_format _mesa_texformat_rgba_float16 = {
+   MESA_FORMAT_RGBA_FLOAT16,           /* MesaFormat */
+   GL_RGBA,                            /* BaseFormat */
+   8 * sizeof(GLhalfNV),               /* RedBits */
+   8 * sizeof(GLhalfNV),               /* GreenBits */
+   8 * sizeof(GLhalfNV),               /* BlueBits */
+   8 * sizeof(GLhalfNV),               /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   4 * sizeof(GLhalfNV),                       /* TexelBytes */
+   fetch_null_texel,                   /* FetchTexel1D */
+   fetch_null_texel,                   /* FetchTexel1D */
+   fetch_null_texel,                   /* FetchTexel1D */
+   fetch_texel_1d_f_rgba_f16,          /* FetchTexel1Df */
+   fetch_texel_2d_f_rgba_f16,          /* FetchTexel2Df */
+   fetch_texel_3d_f_rgba_f16,          /* FetchTexel3Df */
+};
 
-/* =============================================================
- * Hardware formats:
- */
+const struct gl_texture_format _mesa_texformat_rgb_float32 = {
+   MESA_FORMAT_RGB_FLOAT32,            /* MesaFormat */
+   GL_RGB,                             /* BaseFormat */
+   8 * sizeof(GLfloat),                        /* RedBits */
+   8 * sizeof(GLfloat),                        /* GreenBits */
+   8 * sizeof(GLfloat),                        /* BlueBits */
+   0,                                  /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   4 * sizeof(GLfloat),                        /* TexelBytes */
+   fetch_null_texel,                   /* FetchTexel1D */
+   fetch_null_texel,                   /* FetchTexel1D */
+   fetch_null_texel,                   /* FetchTexel1D */
+   fetch_texel_1d_f_rgb_f32,           /* FetchTexel1Df */
+   fetch_texel_2d_f_rgb_f32,           /* FetchTexel2Df */
+   fetch_texel_3d_f_rgb_f32,           /* FetchTexel3Df */
+};
+
+const struct gl_texture_format _mesa_texformat_rgb_float16 = {
+   MESA_FORMAT_RGB_FLOAT16,            /* MesaFormat */
+   GL_RGB,                             /* BaseFormat */
+   8 * sizeof(GLhalfNV),               /* RedBits */
+   8 * sizeof(GLhalfNV),               /* GreenBits */
+   8 * sizeof(GLhalfNV),               /* BlueBits */
+   0,                                  /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   4 * sizeof(GLhalfNV),                       /* TexelBytes */
+   fetch_null_texel,                   /* FetchTexel1D */
+   fetch_null_texel,                   /* FetchTexel1D */
+   fetch_null_texel,                   /* FetchTexel1D */
+   fetch_texel_1d_f_rgb_f16,           /* FetchTexel1Df */
+   fetch_texel_2d_f_rgb_f16,           /* FetchTexel2Df */
+   fetch_texel_3d_f_rgb_f16,           /* FetchTexel3Df */
+};
+
+
+/*@}*/
+
+
+/***************************************************************/
+/** \name Hardware formats */
+/*@{*/
 
 const struct gl_texture_format _mesa_texformat_rgba8888 = {
    MESA_FORMAT_RGBA8888,               /* MesaFormat */
-   GL_RGBA,                            /* IntFormat */
-   GL_UNSIGNED_INT_8_8_8_8,            /* Type */
+   GL_RGBA,                            /* BaseFormat */
    8,                                  /* RedBits */
    8,                                  /* GreenBits */
    8,                                  /* BlueBits */
@@ -234,15 +343,17 @@ const struct gl_texture_format _mesa_texformat_rgba8888 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    4,                                  /* TexelBytes */
-   fetch_1d_texel_rgba8888,            /* FetchTexel1D */
-   fetch_2d_texel_rgba8888,            /* FetchTexel2D */
-   fetch_3d_texel_rgba8888,            /* FetchTexel3D */
+   fetch_texel_1d_rgba8888,            /* FetchTexel1D */
+   fetch_texel_2d_rgba8888,            /* FetchTexel2D */
+   fetch_texel_3d_rgba8888,            /* FetchTexel3D */
+   fetch_texel_1d_f_rgba8888,          /* FetchTexel1Df */
+   fetch_texel_2d_f_rgba8888,          /* FetchTexel2Df */
+   fetch_texel_3d_f_rgba8888,          /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_argb8888 = {
    MESA_FORMAT_ARGB8888,               /* MesaFormat */
-   GL_BGRA,                            /* IntFormat */
-   GL_UNSIGNED_INT_8_8_8_8_REV,                /* Type */
+   GL_RGBA,                            /* BaseFormat */
    8,                                  /* RedBits */
    8,                                  /* GreenBits */
    8,                                  /* BlueBits */
@@ -252,15 +363,17 @@ const struct gl_texture_format _mesa_texformat_argb8888 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    4,                                  /* TexelBytes */
-   fetch_1d_texel_argb8888,            /* FetchTexel1D */
-   fetch_2d_texel_argb8888,            /* FetchTexel2D */
-   fetch_3d_texel_argb8888,            /* FetchTexel3D */
+   fetch_texel_1d_argb8888,            /* FetchTexel1D */
+   fetch_texel_2d_argb8888,            /* FetchTexel2D */
+   fetch_texel_3d_argb8888,            /* FetchTexel3D */
+   fetch_texel_1d_f_argb8888,          /* FetchTexel1Df */
+   fetch_texel_2d_f_argb8888,          /* FetchTexel2Df */
+   fetch_texel_3d_f_argb8888,          /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_rgb888 = {
    MESA_FORMAT_RGB888,                 /* MesaFormat */
-   GL_BGR,                             /* IntFormat */
-   GL_UNSIGNED_BYTE,                   /* Type */
+   GL_RGB,                             /* BaseFormat */
    8,                                  /* RedBits */
    8,                                  /* GreenBits */
    8,                                  /* BlueBits */
@@ -270,15 +383,17 @@ const struct gl_texture_format _mesa_texformat_rgb888 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    3,                                  /* TexelBytes */
-   fetch_1d_texel_rgb888,              /* FetchTexel1D */
-   fetch_2d_texel_rgb888,              /* FetchTexel2D */
-   fetch_3d_texel_rgb888,              /* FetchTexel3D */
+   fetch_texel_1d_rgb888,              /* FetchTexel1D */
+   fetch_texel_2d_rgb888,              /* FetchTexel2D */
+   fetch_texel_3d_rgb888,              /* FetchTexel3D */
+   fetch_texel_1d_f_rgb888,            /* FetchTexel1Df */
+   fetch_texel_2d_f_rgb888,            /* FetchTexel2Df */
+   fetch_texel_3d_f_rgb888,            /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_rgb565 = {
    MESA_FORMAT_RGB565,                 /* MesaFormat */
-   GL_RGB,                             /* IntFormat */
-   GL_UNSIGNED_SHORT_5_6_5,            /* Type */
+   GL_RGB,                             /* BaseFormat */
    5,                                  /* RedBits */
    6,                                  /* GreenBits */
    5,                                  /* BlueBits */
@@ -288,15 +403,17 @@ const struct gl_texture_format _mesa_texformat_rgb565 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    2,                                  /* TexelBytes */
-   fetch_1d_texel_rgb565,              /* FetchTexel1D */
-   fetch_2d_texel_rgb565,              /* FetchTexel2D */
-   fetch_3d_texel_rgb565,              /* FetchTexel3D */
+   fetch_texel_1d_rgb565,              /* FetchTexel1D */
+   fetch_texel_2d_rgb565,              /* FetchTexel2D */
+   fetch_texel_3d_rgb565,              /* FetchTexel3D */
+   fetch_texel_1d_f_rgb565,            /* FetchTexel1Df */
+   fetch_texel_2d_f_rgb565,            /* FetchTexel2Df */
+   fetch_texel_3d_f_rgb565,            /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_argb4444 = {
    MESA_FORMAT_ARGB4444,               /* MesaFormat */
-   GL_BGRA,                            /* IntFormat */
-   GL_UNSIGNED_SHORT_4_4_4_4_REV,      /* Type */
+   GL_RGBA,                            /* BaseFormat */
    4,                                  /* RedBits */
    4,                                  /* GreenBits */
    4,                                  /* BlueBits */
@@ -306,15 +423,17 @@ const struct gl_texture_format _mesa_texformat_argb4444 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    2,                                  /* TexelBytes */
-   fetch_1d_texel_argb4444,            /* FetchTexel1D */
-   fetch_2d_texel_argb4444,            /* FetchTexel2D */
-   fetch_3d_texel_argb4444,            /* FetchTexel3D */
+   fetch_texel_1d_argb4444,            /* FetchTexel1D */
+   fetch_texel_2d_argb4444,            /* FetchTexel2D */
+   fetch_texel_3d_argb4444,            /* FetchTexel3D */
+   fetch_texel_1d_f_argb4444,          /* FetchTexel1Df */
+   fetch_texel_2d_f_argb4444,          /* FetchTexel2Df */
+   fetch_texel_3d_f_argb4444,          /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_argb1555 = {
    MESA_FORMAT_ARGB1555,               /* MesaFormat */
-   GL_BGRA,                            /* IntFormat */
-   GL_UNSIGNED_SHORT_1_5_5_5_REV,      /* Type */
+   GL_RGBA,                            /* BaseFormat */
    5,                                  /* RedBits */
    5,                                  /* GreenBits */
    5,                                  /* BlueBits */
@@ -324,15 +443,17 @@ const struct gl_texture_format _mesa_texformat_argb1555 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    2,                                  /* TexelBytes */
-   fetch_1d_texel_argb1555,            /* FetchTexel1D */
-   fetch_2d_texel_argb1555,            /* FetchTexel2D */
-   fetch_3d_texel_argb1555,            /* FetchTexel3D */
+   fetch_texel_1d_argb1555,            /* FetchTexel1D */
+   fetch_texel_2d_argb1555,            /* FetchTexel2D */
+   fetch_texel_3d_argb1555,            /* FetchTexel3D */
+   fetch_texel_1d_f_argb1555,          /* FetchTexel1Df */
+   fetch_texel_2d_f_argb1555,          /* FetchTexel2Df */
+   fetch_texel_3d_f_argb1555,          /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_al88 = {
    MESA_FORMAT_AL88,                   /* MesaFormat */
-   GL_LUMINANCE_ALPHA,                 /* IntFormat */
-   GL_UNSIGNED_BYTE,                   /* Type */
+   GL_LUMINANCE_ALPHA,                 /* BaseFormat */
    0,                                  /* RedBits */
    0,                                  /* GreenBits */
    0,                                  /* BlueBits */
@@ -342,15 +463,17 @@ const struct gl_texture_format _mesa_texformat_al88 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    2,                                  /* TexelBytes */
-   fetch_1d_texel_al88,                        /* FetchTexel1D */
-   fetch_2d_texel_al88,                        /* FetchTexel2D */
-   fetch_3d_texel_al88,                        /* FetchTexel3D */
+   fetch_texel_1d_al88,                        /* FetchTexel1D */
+   fetch_texel_2d_al88,                        /* FetchTexel2D */
+   fetch_texel_3d_al88,                        /* FetchTexel3D */
+   fetch_texel_1d_f_al88,              /* FetchTexel1Df */
+   fetch_texel_2d_f_al88,              /* FetchTexel2Df */
+   fetch_texel_3d_f_al88,              /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_rgb332 = {
    MESA_FORMAT_RGB332,                 /* MesaFormat */
-   GL_RGB,                             /* IntFormat */
-   GL_UNSIGNED_BYTE_3_3_2,             /* Type */
+   GL_RGB,                             /* BaseFormat */
    3,                                  /* RedBits */
    3,                                  /* GreenBits */
    2,                                  /* BlueBits */
@@ -360,15 +483,17 @@ const struct gl_texture_format _mesa_texformat_rgb332 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    1,                                  /* TexelBytes */
-   fetch_1d_texel_rgb332,              /* FetchTexel1D */
-   fetch_2d_texel_rgb332,              /* FetchTexel2D */
-   fetch_3d_texel_rgb332,              /* FetchTexel3D */
+   fetch_texel_1d_rgb332,              /* FetchTexel1D */
+   fetch_texel_2d_rgb332,              /* FetchTexel2D */
+   fetch_texel_3d_rgb332,              /* FetchTexel3D */
+   fetch_texel_1d_f_rgb332,            /* FetchTexel1Df */
+   fetch_texel_2d_f_rgb332,            /* FetchTexel2Df */
+   fetch_texel_3d_f_rgb332,            /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_a8 = {
    MESA_FORMAT_A8,                     /* MesaFormat */
-   GL_ALPHA,                           /* IntFormat */
-   GL_UNSIGNED_BYTE,                   /* Type */
+   GL_ALPHA,                           /* BaseFormat */
    0,                                  /* RedBits */
    0,                                  /* GreenBits */
    0,                                  /* BlueBits */
@@ -378,15 +503,17 @@ const struct gl_texture_format _mesa_texformat_a8 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    1,                                  /* TexelBytes */
-   fetch_1d_texel_a8,                  /* FetchTexel1D */
-   fetch_2d_texel_a8,                  /* FetchTexel2D */
-   fetch_3d_texel_a8,                  /* FetchTexel3D */
+   fetch_texel_1d_a8,                  /* FetchTexel1D */
+   fetch_texel_2d_a8,                  /* FetchTexel2D */
+   fetch_texel_3d_a8,                  /* FetchTexel3D */
+   fetch_texel_1d_f_a8,                        /* FetchTexel1Df */
+   fetch_texel_2d_f_a8,                        /* FetchTexel2Df */
+   fetch_texel_3d_f_a8,                        /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_l8 = {
    MESA_FORMAT_L8,                     /* MesaFormat */
-   GL_LUMINANCE,                       /* IntFormat */
-   GL_UNSIGNED_BYTE,                   /* Type */
+   GL_LUMINANCE,                       /* BaseFormat */
    0,                                  /* RedBits */
    0,                                  /* GreenBits */
    0,                                  /* BlueBits */
@@ -396,15 +523,17 @@ const struct gl_texture_format _mesa_texformat_l8 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    1,                                  /* TexelBytes */
-   fetch_1d_texel_l8,                  /* FetchTexel1D */
-   fetch_2d_texel_l8,                  /* FetchTexel2D */
-   fetch_3d_texel_l8,                  /* FetchTexel3D */
+   fetch_texel_1d_l8,                  /* FetchTexel1D */
+   fetch_texel_2d_l8,                  /* FetchTexel2D */
+   fetch_texel_3d_l8,                  /* FetchTexel3D */
+   fetch_texel_1d_f_l8,                        /* FetchTexel1Df */
+   fetch_texel_2d_f_l8,                        /* FetchTexel2Df */
+   fetch_texel_3d_f_l8,                        /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_i8 = {
    MESA_FORMAT_I8,                     /* MesaFormat */
-   GL_INTENSITY,                       /* IntFormat */
-   GL_UNSIGNED_BYTE,                   /* Type */
+   GL_INTENSITY,                       /* BaseFormat */
    0,                                  /* RedBits */
    0,                                  /* GreenBits */
    0,                                  /* BlueBits */
@@ -414,15 +543,17 @@ const struct gl_texture_format _mesa_texformat_i8 = {
    0,                                  /* IndexBits */
    0,                                  /* DepthBits */
    1,                                  /* TexelBytes */
-   fetch_1d_texel_i8,                  /* FetchTexel1D */
-   fetch_2d_texel_i8,                  /* FetchTexel2D */
-   fetch_3d_texel_i8,                  /* FetchTexel3D */
+   fetch_texel_1d_i8,                  /* FetchTexel1D */
+   fetch_texel_2d_i8,                  /* FetchTexel2D */
+   fetch_texel_3d_i8,                  /* FetchTexel3D */
+   fetch_texel_1d_f_i8,                        /* FetchTexel1Df */
+   fetch_texel_2d_f_i8,                        /* FetchTexel2Df */
+   fetch_texel_3d_f_i8,                        /* FetchTexel3Df */
 };
 
 const struct gl_texture_format _mesa_texformat_ci8 = {
    MESA_FORMAT_CI8,                    /* MesaFormat */
-   GL_COLOR_INDEX,                     /* IntFormat */
-   GL_UNSIGNED_BYTE,                   /* Type */
+   GL_COLOR_INDEX,                     /* BaseFormat */
    0,                                  /* RedBits */
    0,                                  /* GreenBits */
    0,                                  /* BlueBits */
@@ -432,20 +563,340 @@ const struct gl_texture_format _mesa_texformat_ci8 = {
    8,                                  /* IndexBits */
    0,                                  /* DepthBits */
    1,                                  /* TexelBytes */
-   fetch_1d_texel_ci8,                 /* FetchTexel1D */
-   fetch_2d_texel_ci8,                 /* FetchTexel2D */
-   fetch_3d_texel_ci8,                 /* FetchTexel3D */
+   fetch_texel_1d_ci8,                 /* FetchTexel1D */
+   fetch_texel_2d_ci8,                 /* FetchTexel2D */
+   fetch_texel_3d_ci8,                 /* FetchTexel3D */
+   fetch_texel_1d_f_ci8,               /* FetchTexel1Df */
+   fetch_texel_2d_f_ci8,               /* FetchTexel2Df */
+   fetch_texel_3d_f_ci8,               /* FetchTexel3Df */
 };
 
+const struct gl_texture_format _mesa_texformat_ycbcr = {
+   MESA_FORMAT_YCBCR,                  /* MesaFormat */
+   GL_YCBCR_MESA,                      /* BaseFormat */
+   0,                                  /* RedBits */
+   0,                                  /* GreenBits */
+   0,                                  /* BlueBits */
+   0,                                  /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   2,                                  /* TexelBytes */
+   fetch_texel_1d_ycbcr,               /* FetchTexel1D */
+   fetch_texel_2d_ycbcr,               /* FetchTexel2D */
+   fetch_texel_3d_ycbcr,               /* FetchTexel3D */
+   fetch_texel_1d_f_ycbcr,             /* FetchTexel1Df */
+   fetch_texel_2d_f_ycbcr,             /* FetchTexel2Df */
+   fetch_texel_3d_f_ycbcr,             /* FetchTexel3Df */
+};
 
-/* =============================================================
- * Null format:
- */
+const struct gl_texture_format _mesa_texformat_ycbcr_rev = {
+   MESA_FORMAT_YCBCR_REV,              /* MesaFormat */
+   GL_YCBCR_MESA,                      /* BaseFormat */
+   0,                                  /* RedBits */
+   0,                                  /* GreenBits */
+   0,                                  /* BlueBits */
+   0,                                  /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   2,                                  /* TexelBytes */
+   fetch_texel_1d_ycbcr_rev,           /* FetchTexel1D */
+   fetch_texel_2d_ycbcr_rev,           /* FetchTexel2D */
+   fetch_texel_3d_ycbcr_rev,           /* FetchTexel3D */
+   fetch_texel_1d_f_ycbcr_rev,         /* FetchTexel1Df */
+   fetch_texel_2d_f_ycbcr_rev,         /* FetchTexel2Df */
+   fetch_texel_3d_f_ycbcr_rev,         /* FetchTexel3Df */
+};
+
+const struct gl_texture_format _mesa_texformat_rgb_fxt1 = {
+   MESA_FORMAT_RGB_FXT1,               /* MesaFormat */
+   GL_RGB,                             /* BaseFormat */
+   4, /*approx*/                       /* RedBits */
+   4, /*approx*/                       /* GreenBits */
+   4, /*approx*/                       /* BlueBits */
+   0,                                  /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   0,                                  /* TexelBytes */
+   NULL, /*impossible*/                /* FetchTexel1D */
+   fetch_texel_2d_rgb_fxt1,            /* FetchTexel2D */
+   NULL, /*impossible*/                /* FetchTexel3D */
+   NULL, /*impossible*/                /* FetchTexel1Df */
+   fetch_texel_2d_f_rgb_fxt1,          /* FetchTexel2Df */
+   NULL, /*impossible*/                /* FetchTexel3Df */
+};
+
+const struct gl_texture_format _mesa_texformat_rgba_fxt1 = {
+   MESA_FORMAT_RGBA_FXT1,              /* MesaFormat */
+   GL_RGBA,                            /* BaseFormat */
+   4, /*approx*/                       /* RedBits */
+   4, /*approx*/                       /* GreenBits */
+   4, /*approx*/                       /* BlueBits */
+   1, /*approx*/                       /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   0,                                  /* TexelBytes */
+   NULL, /*impossible*/                /* FetchTexel1D */
+   fetch_texel_2d_rgba_fxt1,           /* FetchTexel2D */
+   NULL, /*impossible*/                /* FetchTexel3D */
+   NULL, /*impossible*/                /* FetchTexel1Df */
+   fetch_texel_2d_f_rgba_fxt1,                 /* FetchTexel2Df */
+   NULL, /*impossible*/                /* FetchTexel3Df */
+};
+
+const struct gl_texture_format _mesa_texformat_rgb_dxt1 = {
+   MESA_FORMAT_RGB_DXT1,               /* MesaFormat */
+   GL_RGB,                             /* BaseFormat */
+   4, /*approx*/                       /* RedBits */
+   4, /*approx*/                       /* GreenBits */
+   4, /*approx*/                       /* BlueBits */
+   0,                                  /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   0,                                  /* TexelBytes */
+   NULL, /*impossible*/                /* FetchTexel1D */
+   fetch_texel_2d_rgb_dxt1,            /* FetchTexel2D */
+   NULL, /*impossible*/                /* FetchTexel3D */
+   NULL, /*impossible*/                /* FetchTexel1Df */
+   fetch_texel_2d_f_rgb_dxt1,          /* FetchTexel2Df */
+   NULL, /*impossible*/                /* FetchTexel3Df */
+};
+
+const struct gl_texture_format _mesa_texformat_rgba_dxt1 = {
+   MESA_FORMAT_RGBA_DXT1,              /* MesaFormat */
+   GL_RGBA,                            /* BaseFormat */
+   4, /*approx*/                       /* RedBits */
+   4, /*approx*/                       /* GreenBits */
+   4, /*approx*/                       /* BlueBits */
+   1, /*approx*/                       /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   0,                                  /* TexelBytes */
+   NULL, /*impossible*/                /* FetchTexel1D */
+   fetch_texel_2d_rgba_dxt1,           /* FetchTexel2D */
+   NULL, /*impossible*/                /* FetchTexel3D */
+   NULL, /*impossible*/                /* FetchTexel1Df */
+   fetch_texel_2d_f_rgba_dxt1,                 /* FetchTexel2Df */
+   NULL, /*impossible*/                /* FetchTexel3Df */
+};
+
+const struct gl_texture_format _mesa_texformat_rgba_dxt3 = {
+   MESA_FORMAT_RGBA_DXT3,              /* MesaFormat */
+   GL_RGBA,                            /* BaseFormat */
+   4, /*approx*/                       /* RedBits */
+   4, /*approx*/                       /* GreenBits */
+   4, /*approx*/                       /* BlueBits */
+   4, /*approx*/                       /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   0,                                  /* TexelBytes */
+   NULL, /*impossible*/                /* FetchTexel1D */
+   fetch_texel_2d_rgba_dxt3,           /* FetchTexel2D */
+   NULL, /*impossible*/                /* FetchTexel3D */
+   NULL, /*impossible*/                /* FetchTexel1Df */
+   fetch_texel_2d_f_rgba_dxt3,                 /* FetchTexel2Df */
+   NULL, /*impossible*/                /* FetchTexel3Df */
+};
+
+const struct gl_texture_format _mesa_texformat_rgba_dxt5 = {
+   MESA_FORMAT_RGBA_DXT5,              /* MesaFormat */
+   GL_RGBA,                            /* BaseFormat */
+   4,/*approx*/                                /* RedBits */
+   4,/*approx*/                                /* GreenBits */
+   4,/*approx*/                                /* BlueBits */
+   4,/*approx*/                                /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   0,                                  /* TexelBytes */
+   NULL, /*impossible*/                /* FetchTexel1D */
+   fetch_texel_2d_rgba_dxt5,           /* FetchTexel2D */
+   NULL, /*impossible*/                /* FetchTexel3D */
+   NULL, /*impossible*/                /* FetchTexel1Df */
+   fetch_texel_2d_f_rgba_dxt5,                 /* FetchTexel2Df */
+   NULL, /*impossible*/                /* FetchTexel3Df */
+};
+
+
+/* Big-endian */
+#if 0
+const struct gl_texture_format _mesa_texformat_abgr8888 = {
+   MESA_FORMAT_ABGR8888,               /* MesaFormat */
+   GL_RGBA,                            /* BaseFormat */
+   GL_UNSIGNED_INT_8_8_8_8,            /* Type */
+   8,                                  /* RedBits */
+   8,                                  /* GreenBits */
+   8,                                  /* BlueBits */
+   8,                                  /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   4,                                  /* TexelBytes */
+   fetch_texel_1d_abgr8888,            /* FetchTexel1D */
+   fetch_texel_2d_abgr8888,            /* FetchTexel2D */
+   fetch_texel_3d_abgr8888,            /* FetchTexel3D */
+   /* XXX float fetchers */
+};
+
+const struct gl_texture_format _mesa_texformat_bgra8888 = {
+   MESA_FORMAT_BGRA8888,               /* MesaFormat */
+   GL_RGBA,                            /* BaseFormat */
+   GL_UNSIGNED_INT_8_8_8_8,            /* Type */
+   8,                                  /* RedBits */
+   8,                                  /* GreenBits */
+   8,                                  /* BlueBits */
+   8,                                  /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   4,                                  /* TexelBytes */
+   fetch_texel_1d_bgra8888,            /* FetchTexel1D */
+   fetch_texel_2d_bgra8888,            /* FetchTexel2D */
+   fetch_texel_3d_bgra8888,            /* FetchTexel3D */
+   /* XXX float fetchers */
+};
+
+const struct gl_texture_format _mesa_texformat_bgr888 = {
+   MESA_FORMAT_BGR888,                 /* MesaFormat */
+   GL_RGB,                             /* BaseFormat */
+   GL_UNSIGNED_BYTE,                   /* Type */
+   8,                                  /* RedBits */
+   8,                                  /* GreenBits */
+   8,                                  /* BlueBits */
+   0,                                  /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   3,                                  /* TexelBytes */
+   fetch_texel_1d_bgr888,              /* FetchTexel1D */
+   fetch_texel_2d_bgr888,              /* FetchTexel2D */
+   fetch_texel_3d_bgr888,              /* FetchTexel3D */
+   /* XXX float fetchers */
+};
+
+const struct gl_texture_format _mesa_texformat_bgr565 = {
+   MESA_FORMAT_BGR565,                 /* MesaFormat */
+   GL_RGB,                             /* BaseFormat */
+   GL_UNSIGNED_SHORT_5_6_5,            /* Type */
+   5,                                  /* RedBits */
+   6,                                  /* GreenBits */
+   5,                                  /* BlueBits */
+   0,                                  /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   2,                                  /* TexelBytes */
+   fetch_texel_1d_bgr565,              /* FetchTexel1D */
+   fetch_texel_2d_bgr565,              /* FetchTexel2D */
+   fetch_texel_3d_bgr565,              /* FetchTexel3D */
+   /* XXX float fetchers */
+};
+
+const struct gl_texture_format _mesa_texformat_bgra4444 = {
+   MESA_FORMAT_BGRA4444,               /* MesaFormat */
+   GL_RGBA,                            /* BaseFormat */
+   GL_UNSIGNED_SHORT_4_4_4_4_REV,      /* Type */
+   4,                                  /* RedBits */
+   4,                                  /* GreenBits */
+   4,                                  /* BlueBits */
+   4,                                  /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   2,                                  /* TexelBytes */
+   fetch_texel_1d_bgra4444,            /* FetchTexel1D */
+   fetch_texel_2d_bgra4444,            /* FetchTexel2D */
+   fetch_texel_3d_bgra4444,            /* FetchTexel3D */
+   /* XXX float fetchers */
+};
+
+const struct gl_texture_format _mesa_texformat_bgra5551 = {
+   MESA_FORMAT_BGRA5551,               /* MesaFormat */
+   GL_RGBA,                            /* BaseFormat */
+   GL_UNSIGNED_SHORT_1_5_5_5_REV,      /* Type */
+   5,                                  /* RedBits */
+   5,                                  /* GreenBits */
+   5,                                  /* BlueBits */
+   1,                                  /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   2,                                  /* TexelBytes */
+   fetch_texel_1d_bgra1555,            /* FetchTexel1D */
+   fetch_texel_2d_bgra1555,            /* FetchTexel2D */
+   fetch_texel_3d_bgra1555,            /* FetchTexel3D */
+   /* XXX float fetchers */
+};
+
+const struct gl_texture_format _mesa_texformat_la88 = {
+   MESA_FORMAT_LA88,                   /* MesaFormat */
+   GL_LUMINANCE_ALPHA,                 /* BaseFormat */
+   GL_UNSIGNED_BYTE,                   /* Type */
+   0,                                  /* RedBits */
+   0,                                  /* GreenBits */
+   0,                                  /* BlueBits */
+   8,                                  /* AlphaBits */
+   8,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   2,                                  /* TexelBytes */
+   fetch_texel_1d_la88,                        /* FetchTexel1D */
+   fetch_texel_2d_la88,                        /* FetchTexel2D */
+   fetch_texel_3d_la88,                        /* FetchTexel3D */
+   /* XXX float fetchers */
+};
+
+const struct gl_texture_format _mesa_texformat_bgr233 = {
+   MESA_FORMAT_BGR233,                 /* MesaFormat */
+   GL_RGB,                             /* BaseFormat */
+   GL_UNSIGNED_BYTE_3_3_2,             /* Type */
+   3,                                  /* RedBits */
+   3,                                  /* GreenBits */
+   2,                                  /* BlueBits */
+   0,                                  /* AlphaBits */
+   0,                                  /* LuminanceBits */
+   0,                                  /* IntensityBits */
+   0,                                  /* IndexBits */
+   0,                                  /* DepthBits */
+   1,                                  /* TexelBytes */
+   fetch_texel_1d_bgr233,              /* FetchTexel1D */
+   fetch_texel_2d_bgr233,              /* FetchTexel2D */
+   fetch_texel_3d_bgr233,              /* FetchTexel3D */
+   /* XXX float fetchers */
+};
+#endif
+
+/*@}*/
+
+
+/***************************************************************/
+/** \name Null format (useful for proxy textures) */
+/*@{*/
 
 const struct gl_texture_format _mesa_null_texformat = {
    -1,                                 /* MesaFormat */
-   0,                                  /* IntFormat */
-   0,                                  /* Type */
+   0,                                  /* BaseFormat */
    0,                                  /* RedBits */
    0,                                  /* GreenBits */
    0,                                  /* BlueBits */
@@ -458,10 +909,26 @@ const struct gl_texture_format _mesa_null_texformat = {
    fetch_null_texel,                   /* FetchTexel1D */
    fetch_null_texel,                   /* FetchTexel2D */
    fetch_null_texel,                   /* FetchTexel3D */
+   fetch_null_texelf,                  /* FetchTexel1Df */
+   fetch_null_texelf,                  /* FetchTexel2Df */
+   fetch_null_texelf,                  /* FetchTexel3Df */
 };
 
+/*@}*/
 
 
+/**
+ * Determine whether a given texture format is a hardware texture
+ * format.
+ *
+ * \param format texture format.
+ * 
+ * \return GL_TRUE if \p format is a hardware texture format, or GL_FALSE
+ * otherwise.
+ *
+ * \p format is a hardware texture format if gl_texture_format::MesaFormat is
+ * lower than _format::MESA_FORMAT_RGBA.
+ */
 GLboolean
 _mesa_is_hardware_tex_format( const struct gl_texture_format *format )
 {
@@ -469,10 +936,20 @@ _mesa_is_hardware_tex_format( const struct gl_texture_format *format )
 }
 
 
-/* Given an internal texture format or 1, 2, 3, 4 initialize the texture
- * image structure's default format and type information.  Drivers will
- * initialize these fields accordingly if they override the default
- * storage format.
+/**
+ * Choose an appropriate texture format given the format, type and
+ * internalFormat parameters passed to glTexImage().
+ *
+ * \param ctx  the GL context.
+ * \param internalFormat  user's prefered internal texture format.
+ * \param format  incoming image pixel format.
+ * \param type  incoming image data type.
+ *
+ * \return a pointer to a gl_texture_format object which describes the
+ * choosen texture format, or NULL on failure.
+ * 
+ * This is called via dd_function_table::ChooseTextureFormat.  Hardware drivers
+ * typically override this function with a specialized version.
  */
 const struct gl_texture_format *
 _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
@@ -560,13 +1037,141 @@ _mesa_choose_tex_format( GLcontext *ctx, GLint internalFormat,
    case GL_DEPTH_COMPONENT16_SGIX:
    case GL_DEPTH_COMPONENT24_SGIX:
    case GL_DEPTH_COMPONENT32_SGIX:
-      if ( !ctx->Extensions.SGIX_depth_texture )
-        _mesa_problem( ctx, "depth format without GL_SGIX_depth_texture" );
+      if (!ctx->Extensions.SGIX_depth_texture)
+        _mesa_problem(ctx, "depth format without GL_SGIX_depth_texture");
       return &_mesa_texformat_depth_component;
 
+   case GL_COMPRESSED_ALPHA_ARB:
+      if (!ctx->Extensions.ARB_texture_compression)
+        _mesa_problem(ctx, "texture compression extension not enabled");
+      return &_mesa_texformat_alpha;
+   case GL_COMPRESSED_LUMINANCE_ARB:
+      if (!ctx->Extensions.ARB_texture_compression)
+        _mesa_problem(ctx, "texture compression extension not enabled");
+      return &_mesa_texformat_luminance;
+   case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
+      if (!ctx->Extensions.ARB_texture_compression)
+        _mesa_problem(ctx, "texture compression extension not enabled");
+      return &_mesa_texformat_luminance_alpha;
+   case GL_COMPRESSED_INTENSITY_ARB:
+      if (!ctx->Extensions.ARB_texture_compression)
+        _mesa_problem(ctx, "texture compression extension not enabled");
+      return &_mesa_texformat_intensity;
+   case GL_COMPRESSED_RGB_ARB:
+      if (!ctx->Extensions.ARB_texture_compression)
+        _mesa_problem(ctx, "texture compression extension not enabled");
+      if (ctx->Extensions.TDFX_texture_compression_FXT1)
+         return &_mesa_texformat_rgb_fxt1;
+      else if (ctx->Extensions.EXT_texture_compression_s3tc || ctx->Extensions.S3_s3tc)
+         return &_mesa_texformat_rgb_dxt1;
+      return &_mesa_texformat_rgb;
+   case GL_COMPRESSED_RGBA_ARB:
+      if (!ctx->Extensions.ARB_texture_compression)
+        _mesa_problem(ctx, "texture compression extension not enabled");
+      if (ctx->Extensions.TDFX_texture_compression_FXT1)
+         return &_mesa_texformat_rgba_fxt1;
+      else if (ctx->Extensions.EXT_texture_compression_s3tc || ctx->Extensions.S3_s3tc)
+         return &_mesa_texformat_rgba_dxt3;  /* Not rgba_dxt1!  See the spec */
+      return &_mesa_texformat_rgba;
+
+   /* GL_MESA_ycrcr_texture */
+   case GL_YCBCR_MESA:
+      if (type == GL_UNSIGNED_SHORT_8_8_MESA)
+         return &_mesa_texformat_ycbcr;
+      else
+         return &_mesa_texformat_ycbcr_rev;
+
+   /* GL_3DFX_texture_compression_FXT1 */
+   case GL_COMPRESSED_RGB_FXT1_3DFX:
+      if (ctx->Extensions.TDFX_texture_compression_FXT1)
+         return &_mesa_texformat_rgb_fxt1;
+      else
+         return NULL;
+   case GL_COMPRESSED_RGBA_FXT1_3DFX:
+      if (ctx->Extensions.TDFX_texture_compression_FXT1)
+         return &_mesa_texformat_rgba_fxt1;
+      else
+         return NULL;
+
+   /* GL_EXT_texture_compression_s3tc */
+   case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
+      if (ctx->Extensions.EXT_texture_compression_s3tc)
+         return &_mesa_texformat_rgb_dxt1;
+      else
+         return NULL;
+   case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+      if (ctx->Extensions.EXT_texture_compression_s3tc)
+         return &_mesa_texformat_rgba_dxt1;
+      else
+         return NULL;
+   case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
+      if (ctx->Extensions.EXT_texture_compression_s3tc)
+         return &_mesa_texformat_rgba_dxt3;
+      else
+         return NULL;
+   case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
+      if (ctx->Extensions.EXT_texture_compression_s3tc)
+         return &_mesa_texformat_rgba_dxt5;
+      else
+         return NULL;
+
+   /* GL_S3_s3tc */
+   case GL_RGB_S3TC:
+   case GL_RGB4_S3TC:
+      if (ctx->Extensions.S3_s3tc)
+         return &_mesa_texformat_rgb_dxt1;
+      else
+         return NULL;
+   case GL_RGBA_S3TC:
+   case GL_RGBA4_S3TC:
+      if (ctx->Extensions.S3_s3tc)
+         return &_mesa_texformat_rgba_dxt3;
+      else
+         return NULL;
+
+   /* XXX prototype/example code */
+   /* GL_ATI_texture_float or GL_NV_float_buffer */
+   case GL_RGBA_FLOAT32_ATI:
+      return &_mesa_texformat_rgba_float32;
+   case GL_RGBA_FLOAT16_ATI:
+      return &_mesa_texformat_rgba_float16;
+   case GL_RGB_FLOAT32_ATI:
+      return &_mesa_texformat_rgb_float32;
+   case GL_RGB_FLOAT16_ATI:
+      return &_mesa_texformat_rgb_float16;
+
    default:
-      _mesa_problem( ctx, "unexpected format in _mesa_choose_tex_format()" );
-      printf("intformat = %d %x\n", internalFormat, internalFormat );
+      _mesa_problem(ctx, "unexpected format in _mesa_choose_tex_format()");
       return NULL;
    }
 }
+
+
+/**
+ * Return the base texture format for the given compressed format
+ * 
+ * Called via dd_function_table::Driver.BaseCompressedTexFormat.
+ * This function is used by software rasterizers.  Hardware drivers
+ * which support texture compression should not use this function but
+ * a specialized function instead.
+ */
+GLint
+_mesa_base_compressed_texformat(GLcontext *ctx, GLint intFormat)
+{
+   switch (intFormat) {
+   case GL_COMPRESSED_ALPHA_ARB:
+      return GL_ALPHA;
+   case GL_COMPRESSED_LUMINANCE_ARB:
+      return GL_LUMINANCE;
+   case GL_COMPRESSED_LUMINANCE_ALPHA_ARB:
+      return GL_LUMINANCE_ALPHA;
+   case GL_COMPRESSED_INTENSITY_ARB:
+      return GL_INTENSITY;
+   case GL_COMPRESSED_RGB_ARB:
+      return GL_RGB;
+   case GL_COMPRESSED_RGBA_ARB:
+      return GL_RGBA;
+   default:
+      return -1;  /* not a recognized compressed format */
+   }
+}