Remove a bunch texel fetch functions that can be handled by the new

adaptor functions.

2 files changed, 131 insertions, 614 deletions

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 878a10bb7cb..794dea313aa 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -31,15 +31,9 @@
  */
 
 
-#include "glheader.h"
 #include "colormac.h"
 #include "context.h"
-#include "image.h"
-#include "imports.h"
-#include "mtypes.h"
 #include "texformat.h"
-#include "teximage.h"
-#include "texstate.h"
 #include "texstore.h"
 
 
@@ -89,6 +83,19 @@ static void store_null_texel(struct gl_texture_image *texImage,
 }
 
 
+/**
+ * Notes about the predefined gl_texture_formats:
+ *
+ * 1. There are 1D, 2D and 3D functions for fetching texels from texture
+ *    images, returning both GLchan values and GLfloat values.  (six
+ *    functions in total)
+ *    You don't have to provide both the GLchan and GLfloat functions;
+ *    just one or the other is OK.  Mesa will use an "adaptor" to convert
+ *    between GLchan/GLfloat when needed.
+ *    Since the adaptors have small performance penalty, we provide both
+ *    GLchan and GLfloat functions for some common formats like RGB, RGBA.
+ */
+
 
 /***************************************************************/
 /** \name Default GLchan-based formats */
@@ -157,9 +164,9 @@ const struct gl_texture_format _mesa_texformat_alpha = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_alpha			/* StoreTexel */
 };
 
@@ -180,9 +187,9 @@ const struct gl_texture_format _mesa_texformat_luminance = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_luminance		/* StoreTexel */
 };
 
@@ -203,9 +210,9 @@ const struct gl_texture_format _mesa_texformat_luminance_alpha = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_luminance_alpha		/* StoreTexel */
 };
 
@@ -226,9 +233,9 @@ const struct gl_texture_format _mesa_texformat_intensity = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_intensity		/* StoreTexel */
 };
 
@@ -246,9 +253,9 @@ const struct gl_texture_format _mesa_texformat_depth_component_float32 = {
    sizeof(GLfloat) * 8,			/* DepthBits */
    sizeof(GLfloat),			/* TexelBytes */
    _mesa_texstore_depth_component_float32,/* StoreTexImageFunc */
-   fetch_null_texel,			/* FetchTexel1D */
-   fetch_null_texel,			/* FetchTexel1D */
-   fetch_null_texel,			/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
    fetch_texel_1d_f_depth_component_f32,/* FetchTexel1Df */
    fetch_texel_2d_f_depth_component_f32,/* FetchTexel2Df */
    fetch_texel_3d_f_depth_component_f32,/* FetchTexel3Df */
@@ -269,9 +276,9 @@ const struct gl_texture_format _mesa_texformat_depth_component16 = {
    sizeof(GLushort) * 8,		/* DepthBits */
    sizeof(GLushort),			/* TexelBytes */
    _mesa_texstore_depth_component16,	/* StoreTexImageFunc */
-   fetch_null_texel,			/* FetchTexel1D */
-   fetch_null_texel,			/* FetchTexel1D */
-   fetch_null_texel,			/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
    fetch_texel_1d_f_depth_component16,	/* FetchTexel1Df */
    fetch_texel_2d_f_depth_component16,	/* FetchTexel2Df */
    fetch_texel_3d_f_depth_component16,	/* FetchTexel3Df */
@@ -292,9 +299,9 @@ const struct gl_texture_format _mesa_texformat_rgba_float32 = {
    0,					/* DepthBits */
    4 * sizeof(GLfloat),			/* TexelBytes */
    _mesa_texstore_rgba_float32,		/* StoreTexImageFunc */
-   fetch_texel_1d_rgba_f32,		/* FetchTexel1D */
-   fetch_texel_2d_rgba_f32,		/* FetchTexel1D */
-   fetch_texel_3d_rgba_f32,		/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
    fetch_texel_1d_f_rgba_f32,		/* FetchTexel1Df */
    fetch_texel_2d_f_rgba_f32,		/* FetchTexel2Df */
    fetch_texel_3d_f_rgba_f32,		/* FetchTexel3Df */
@@ -315,9 +322,9 @@ const struct gl_texture_format _mesa_texformat_rgba_float16 = {
    0,					/* DepthBits */
    4 * sizeof(GLhalfARB),		/* TexelBytes */
    _mesa_texstore_rgba_float16,		/* StoreTexImageFunc */
-   fetch_texel_1d_rgba_f16,		/* FetchTexel1D */
-   fetch_texel_2d_rgba_f16,		/* FetchTexel1D */
-   fetch_texel_3d_rgba_f16,		/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
    fetch_texel_1d_f_rgba_f16,		/* FetchTexel1Df */
    fetch_texel_2d_f_rgba_f16,		/* FetchTexel2Df */
    fetch_texel_3d_f_rgba_f16,		/* FetchTexel3Df */
@@ -338,9 +345,9 @@ const struct gl_texture_format _mesa_texformat_rgb_float32 = {
    0,					/* DepthBits */
    3 * sizeof(GLfloat),			/* TexelBytes */
    _mesa_texstore_rgba_float32,/*yes*/	/* StoreTexImageFunc */
-   fetch_texel_1d_rgb_f32,		/* FetchTexel1D */
-   fetch_texel_2d_rgb_f32,		/* FetchTexel1D */
-   fetch_texel_3d_rgb_f32,		/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
    fetch_texel_1d_f_rgb_f32,		/* FetchTexel1Df */
    fetch_texel_2d_f_rgb_f32,		/* FetchTexel2Df */
    fetch_texel_3d_f_rgb_f32,		/* FetchTexel3Df */
@@ -361,9 +368,9 @@ const struct gl_texture_format _mesa_texformat_rgb_float16 = {
    0,					/* DepthBits */
    3 * sizeof(GLhalfARB),		/* TexelBytes */
    _mesa_texstore_rgba_float16,/*yes*/	/* StoreTexImageFunc */
-   fetch_texel_1d_rgb_f16,		/* FetchTexel1D */
-   fetch_texel_2d_rgb_f16,		/* FetchTexel1D */
-   fetch_texel_3d_rgb_f16,		/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
    fetch_texel_1d_f_rgb_f16,		/* FetchTexel1Df */
    fetch_texel_2d_f_rgb_f16,		/* FetchTexel2Df */
    fetch_texel_3d_f_rgb_f16,		/* FetchTexel3Df */
@@ -384,9 +391,9 @@ const struct gl_texture_format _mesa_texformat_alpha_float32 = {
    0,					/* DepthBits */
    1 * sizeof(GLfloat),			/* TexelBytes */
    _mesa_texstore_rgba_float32,/*yes*/	/* StoreTexImageFunc */
-   fetch_texel_1d_alpha_f32,		/* FetchTexel1D */
-   fetch_texel_2d_alpha_f32,		/* FetchTexel1D */
-   fetch_texel_3d_alpha_f32,		/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
    fetch_texel_1d_f_alpha_f32,		/* FetchTexel1Df */
    fetch_texel_2d_f_alpha_f32,		/* FetchTexel2Df */
    fetch_texel_3d_f_alpha_f32,		/* FetchTexel3Df */
@@ -407,9 +414,9 @@ const struct gl_texture_format _mesa_texformat_alpha_float16 = {
    0,					/* DepthBits */
    1 * sizeof(GLhalfARB),		/* TexelBytes */
    _mesa_texstore_rgba_float16,/*yes*/	/* StoreTexImageFunc */
-   fetch_texel_1d_alpha_f16,		/* FetchTexel1D */
-   fetch_texel_2d_alpha_f16,		/* FetchTexel1D */
-   fetch_texel_3d_alpha_f16,		/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel1D */
    fetch_texel_1d_f_alpha_f16,		/* FetchTexel1Df */
    fetch_texel_2d_f_alpha_f16,		/* FetchTexel2Df */
    fetch_texel_3d_f_alpha_f16,		/* FetchTexel3Df */
@@ -430,9 +437,9 @@ const struct gl_texture_format _mesa_texformat_luminance_float32 = {
    0,					/* DepthBits */
    1 * sizeof(GLfloat),			/* TexelBytes */
    _mesa_texstore_rgba_float32,/*yes*/	/* StoreTexImageFunc */
-   fetch_texel_1d_luminance_f32,	/* FetchTexel1D */
-   fetch_texel_2d_luminance_f32,	/* FetchTexel2D */
-   fetch_texel_3d_luminance_f32,	/* FetchTexel3D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
    fetch_texel_1d_f_luminance_f32,	/* FetchTexel1Df */
    fetch_texel_2d_f_luminance_f32,	/* FetchTexel2Df */
    fetch_texel_3d_f_luminance_f32,	/* FetchTexel3Df */
@@ -453,9 +460,9 @@ const struct gl_texture_format _mesa_texformat_luminance_float16 = {
    0,					/* DepthBits */
    1 * sizeof(GLhalfARB),		/* TexelBytes */
    _mesa_texstore_rgba_float16,/*yes*/	/* StoreTexImageFunc */
-   fetch_texel_1d_luminance_f16,	/* FetchTexel1D */
-   fetch_texel_2d_luminance_f16,	/* FetchTexel2D */
-   fetch_texel_3d_luminance_f16,	/* FetchTexel3D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
    fetch_texel_1d_f_luminance_f16,	/* FetchTexel1Df */
    fetch_texel_2d_f_luminance_f16,	/* FetchTexel2Df */
    fetch_texel_3d_f_luminance_f16,	/* FetchTexel3Df */
@@ -476,9 +483,9 @@ const struct gl_texture_format _mesa_texformat_luminance_alpha_float32 = {
    0,					/* DepthBits */
    2 * sizeof(GLfloat),			/* TexelBytes */
    _mesa_texstore_rgba_float32,		/* StoreTexImageFunc */
-   fetch_texel_1d_luminance_alpha_f32,	/* FetchTexel1D */
-   fetch_texel_2d_luminance_alpha_f32,	/* FetchTexel2D */
-   fetch_texel_3d_luminance_alpha_f32,	/* FetchTexel3D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* 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 */
@@ -499,9 +506,9 @@ const struct gl_texture_format _mesa_texformat_luminance_alpha_float16 = {
    0,					/* DepthBits */
    2 * sizeof(GLhalfARB),		/* TexelBytes */
    _mesa_texstore_rgba_float16,		/* StoreTexImageFunc */
-   fetch_texel_1d_luminance_alpha_f16,	/* FetchTexel1D */
-   fetch_texel_2d_luminance_alpha_f16,	/* FetchTexel2D */
-   fetch_texel_3d_luminance_alpha_f16,	/* FetchTexel3D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* 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 */
@@ -522,9 +529,9 @@ const struct gl_texture_format _mesa_texformat_intensity_float32 = {
    0,					/* DepthBits */
    1 * sizeof(GLfloat),			/* TexelBytes */
    _mesa_texstore_rgba_float32,/*yes*/	/* StoreTexImageFunc */
-   fetch_texel_1d_intensity_f32,	/* FetchTexel1D */
-   fetch_texel_2d_intensity_f32,	/* FetchTexel2D */
-   fetch_texel_3d_intensity_f32,	/* FetchTexel3D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
    fetch_texel_1d_f_intensity_f32,	/* FetchTexel1Df */
    fetch_texel_2d_f_intensity_f32,	/* FetchTexel2Df */
    fetch_texel_3d_f_intensity_f32,	/* FetchTexel3Df */
@@ -545,9 +552,9 @@ const struct gl_texture_format _mesa_texformat_intensity_float16 = {
    0,					/* DepthBits */
    1 * sizeof(GLhalfARB),		/* TexelBytes */
    _mesa_texstore_rgba_float16,/*yes*/	/* StoreTexImageFunc */
-   fetch_texel_1d_intensity_f16,	/* FetchTexel1D */
-   fetch_texel_2d_intensity_f16,	/* FetchTexel2D */
-   fetch_texel_3d_intensity_f16,	/* FetchTexel3D */
+   NULL,				/* FetchTexel1D */
+   NULL,				/* FetchTexel2D */
+   NULL,				/* FetchTexel3D */
    fetch_texel_1d_f_intensity_f16,	/* FetchTexel1Df */
    fetch_texel_2d_f_intensity_f16,	/* FetchTexel2Df */
    fetch_texel_3d_f_intensity_f16,	/* FetchTexel3Df */
@@ -579,9 +586,9 @@ const struct gl_texture_format _mesa_texformat_rgba8888 = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_rgba8888			/* StoreTexel */
 };
 
@@ -602,9 +609,9 @@ const struct gl_texture_format _mesa_texformat_rgba8888_rev = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_rgba8888_rev		/* StoreTexel */
 };
 
@@ -625,9 +632,9 @@ const struct gl_texture_format _mesa_texformat_argb8888 = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_argb8888			/* StoreTexel */
 };
 
@@ -648,9 +655,9 @@ const struct gl_texture_format _mesa_texformat_argb8888_rev = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_argb8888_rev		/* StoreTexel */
 };
 
@@ -671,9 +678,9 @@ const struct gl_texture_format _mesa_texformat_rgb888 = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_rgb888			/* StoreTexel */
 };
 
@@ -694,9 +701,9 @@ const struct gl_texture_format _mesa_texformat_bgr888 = {
    fetch_texel_1d_bgr888,		/* FetchTexel1D */
    fetch_texel_2d_bgr888,		/* FetchTexel2D */
    fetch_texel_3d_bgr888,		/* FetchTexel3D */
-   fetch_texel_1d_f_bgr888,		/* FetchTexel1Df */
-   fetch_texel_2d_f_bgr888,		/* FetchTexel2Df */
-   fetch_texel_3d_f_bgr888,		/* FetchTexel3Df */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_bgr888			/* StoreTexel */
 };
 
@@ -717,9 +724,9 @@ const struct gl_texture_format _mesa_texformat_rgb565 = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_rgb565			/* StoreTexel */
 };
 
@@ -740,9 +747,9 @@ const struct gl_texture_format _mesa_texformat_rgb565_rev = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_rgb565_rev		/* StoreTexel */
 };
 
@@ -763,9 +770,9 @@ const struct gl_texture_format _mesa_texformat_argb4444 = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_argb4444			/* StoreTexel */
 };
 
@@ -786,9 +793,9 @@ const struct gl_texture_format _mesa_texformat_argb4444_rev = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_argb4444_rev		/* StoreTexel */
 };
 
@@ -809,9 +816,9 @@ const struct gl_texture_format _mesa_texformat_argb1555 = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_argb1555			/* StoreTexel */
 };
 
@@ -832,9 +839,9 @@ const struct gl_texture_format _mesa_texformat_argb1555_rev = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_argb1555_rev		/* StoreTexel */
 };
 
@@ -855,9 +862,9 @@ const struct gl_texture_format _mesa_texformat_al88 = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_al88			/* StoreTexel */
 };
 
@@ -878,9 +885,9 @@ const struct gl_texture_format _mesa_texformat_al88_rev = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_al88_rev			/* StoreTexel */
 };
 
@@ -901,9 +908,9 @@ const struct gl_texture_format _mesa_texformat_rgb332 = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_rgb332			/* StoreTexel */
 };
 
@@ -924,9 +931,9 @@ const struct gl_texture_format _mesa_texformat_a8 = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_a8			/* StoreTexel */
 };
 
@@ -947,9 +954,9 @@ const struct gl_texture_format _mesa_texformat_l8 = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_l8			/* StoreTexel */
 };
 
@@ -970,9 +977,9 @@ const struct gl_texture_format _mesa_texformat_i8 = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_i8			/* StoreTexel */
 };
 
@@ -993,9 +1000,9 @@ const struct gl_texture_format _mesa_texformat_ci8 = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_ci8			/* StoreTexel */
 };
 
@@ -1016,9 +1023,9 @@ const struct gl_texture_format _mesa_texformat_ycbcr = {
    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,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_ycbcr			/* StoreTexel */
 };
 
@@ -1039,9 +1046,9 @@ const struct gl_texture_format _mesa_texformat_ycbcr_rev = {
    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 */
+   NULL,				/* FetchTexel1Df */
+   NULL,				/* FetchTexel2Df */
+   NULL,				/* FetchTexel3Df */
    store_texel_ycbcr_rev		/* StoreTexel */
 };
 
diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index 1e2ecbdb265..f060179eeea 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -153,17 +153,6 @@ static void FETCH(alpha)( const struct gl_texture_image *texImage,
    texel[ACOMP] = src[0];
 }
 
-/* Fetch texel from 1D, 2D or 3D ALPHA texture, returning 4 GLfloats */
-static void FETCH(f_alpha)( const struct gl_texture_image *texImage,
-                            GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = 0.0;
-   texel[ACOMP] = CHAN_TO_FLOAT(src[0]);
-}
-
 #if DIM == 3
 static void store_texel_alpha(struct gl_texture_image *texImage,
                               GLint i, GLint j, GLint k, const void *texel)
@@ -187,17 +176,6 @@ static void FETCH(luminance)( const struct gl_texture_image *texImage,
    texel[ACOMP] = CHAN_MAX;
 }
 
-/* Fetch texel from 1D, 2D or 3D LUMIN texture, returning 4 GLfloats */
-static void FETCH(f_luminance)( const struct gl_texture_image *texImage,
-                                GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = CHAN_TO_FLOAT(src[0]);
-   texel[ACOMP] = 1.0F;
-}
-
 #if DIM == 3
 static void store_texel_luminance(struct gl_texture_image *texImage,
                                   GLint i, GLint j, GLint k, const void *texel)
@@ -221,17 +199,6 @@ static void FETCH(luminance_alpha)( const struct gl_texture_image *texImage,
    texel[ACOMP] = src[1];
 }
 
-/* Fetch texel from 1D, 2D or 3D L_A texture, returning 4 GLfloats */
-static void FETCH(f_luminance_alpha)( const struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 2);
-   texel[RCOMP] = 
-   texel[GCOMP] = 
-   texel[BCOMP] = CHAN_TO_FLOAT(src[0]);
-   texel[ACOMP] = CHAN_TO_FLOAT(src[1]);
-}
-
 #if DIM == 3
 static void store_texel_luminance_alpha(struct gl_texture_image *texImage,
                                   GLint i, GLint j, GLint k, const void *texel)
@@ -256,17 +223,6 @@ static void FETCH(intensity)( const struct gl_texture_image *texImage,
    texel[ACOMP] = src[0];
 }
 
-/* Fetch texel from 1D, 2D or 3D INT. texture, returning 4 GLfloats */
-static void FETCH(f_intensity)( const struct gl_texture_image *texImage,
-                                GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLchan *src = TEXEL_ADDR(GLchan, texImage, i, j, k, 1);
-   texel[RCOMP] = 
-   texel[GCOMP] = 
-   texel[BCOMP] = 
-   texel[ACOMP] = CHAN_TO_FLOAT(src[0]);
-}
-
 #if DIM == 3
 static void store_texel_intensity(struct gl_texture_image *texImage,
                                   GLint i, GLint j, GLint k, const void *texel)
@@ -328,18 +284,6 @@ static void store_texel_depth_component16(struct gl_texture_image *texImage,
 
 /* MESA_FORMAT_RGBA_F32 ******************************************************/
 
-/* Fetch texel from 1D, 2D or 3D RGBA_FLOAT32 texture, returning 4 GLchans.
- */
-static void FETCH(rgba_f32)( const struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, GLchan *texel )
-{
-   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 4);
-   UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], src[0]);
-   UNCLAMPED_FLOAT_TO_CHAN(texel[GCOMP], src[1]);
-   UNCLAMPED_FLOAT_TO_CHAN(texel[BCOMP], src[2]);
-   UNCLAMPED_FLOAT_TO_CHAN(texel[ACOMP], src[3]);
-}
-
 /* Fetch texel from 1D, 2D or 3D RGBA_FLOAT32 texture, returning 4 GLfloats.
  */
 static void FETCH(f_rgba_f32)( const struct gl_texture_image *texImage,
@@ -369,19 +313,6 @@ static void store_texel_rgba_f32(struct gl_texture_image *texImage,
 /* MESA_FORMAT_RGBA_F16 ******************************************************/
 
 /* Fetch texel from 1D, 2D or 3D RGBA_FLOAT16 texture,
- * returning 4 GLchans.
- */
-static void FETCH(rgba_f16)( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLchan *texel )
-{
-   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 4);
-   UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], _mesa_half_to_float(src[0]));
-   UNCLAMPED_FLOAT_TO_CHAN(texel[GCOMP], _mesa_half_to_float(src[1]));
-   UNCLAMPED_FLOAT_TO_CHAN(texel[BCOMP], _mesa_half_to_float(src[2]));
-   UNCLAMPED_FLOAT_TO_CHAN(texel[ACOMP], _mesa_half_to_float(src[3]));
-}
-
-/* Fetch texel from 1D, 2D or 3D RGBA_FLOAT16 texture,
  * returning 4 GLfloats.
  */
 static void FETCH(f_rgba_f16)( const struct gl_texture_image *texImage,
@@ -407,19 +338,6 @@ static void store_texel_rgba_f16(struct gl_texture_image *texImage,
 /* MESA_FORMAT_RGB_F32 *******************************************************/
 
 /* Fetch texel from 1D, 2D or 3D RGB_FLOAT32 texture,
- * returning 4 GLchans.
- */
-static void FETCH(rgb_f32)( const struct gl_texture_image *texImage,
-                            GLint i, GLint j, GLint k, GLchan *texel )
-{
-   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 3);
-   UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], src[0]);
-   UNCLAMPED_FLOAT_TO_CHAN(texel[GCOMP], src[1]);
-   UNCLAMPED_FLOAT_TO_CHAN(texel[BCOMP], src[2]);
-   texel[ACOMP] = CHAN_MAX;
-}
-
-/* Fetch texel from 1D, 2D or 3D RGB_FLOAT32 texture,
  * returning 4 GLfloats.
  */
 static void FETCH(f_rgb_f32)( const struct gl_texture_image *texImage,
@@ -443,20 +361,7 @@ static void store_texel_rgb_f32(struct gl_texture_image *texImage,
 #endif
 
 
-/* MESA_FORAMT_RGB_F16 *******************************************************/
-
-/* Fetch texel from 1D, 2D or 3D RGBA_FLOAT16 texture,
- * returning 4 GLchans.
- */
-static void FETCH(rgb_f16)( const struct gl_texture_image *texImage,
-                            GLint i, GLint j, GLint k, GLchan *texel )
-{
-   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 3);
-   UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], _mesa_half_to_float(src[0]));
-   UNCLAMPED_FLOAT_TO_CHAN(texel[GCOMP], _mesa_half_to_float(src[1]));
-   UNCLAMPED_FLOAT_TO_CHAN(texel[BCOMP], _mesa_half_to_float(src[2]));
-   texel[ACOMP] = CHAN_MAX;
-}
+/* MESA_FORMAT_RGB_F16 *******************************************************/
 
 /* Fetch texel from 1D, 2D or 3D RGB_FLOAT16 texture,
  * returning 4 GLfloats.
@@ -485,19 +390,6 @@ static void store_texel_rgb_f16(struct gl_texture_image *texImage,
 /* MESA_FORMAT_ALPHA_F32 *****************************************************/
 
 /* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT32 texture,
- * returning 4 GLchans.
- */
-static void FETCH(alpha_f32)( const struct gl_texture_image *texImage,
-                              GLint i, GLint j, GLint k, GLchan *texel )
-{
-   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = 0;
-   UNCLAMPED_FLOAT_TO_CHAN(texel[ACOMP], src[0]);
-}
-
-/* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT32 texture,
  * returning 4 GLfloats.
  */
 static void FETCH(f_alpha_f32)( const struct gl_texture_image *texImage,
@@ -524,19 +416,6 @@ static void store_texel_alpha_f32(struct gl_texture_image *texImage,
 /* MESA_FORMAT_ALPHA_F32 *****************************************************/
 
 /* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT16 texture,
- * returning 4 GLchans.
- */
-static void FETCH(alpha_f16)( const struct gl_texture_image *texImage,
-                              GLint i, GLint j, GLint k, GLchan *texel )
-{
-   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
-   texel[RCOMP] =
-   texel[GCOMP] =
-   texel[BCOMP] = 0;
-   UNCLAMPED_FLOAT_TO_CHAN(texel[ACOMP], _mesa_half_to_float(src[0]));
-}
-
-/* Fetch texel from 1D, 2D or 3D ALPHA_FLOAT16 texture,
  * returning 4 GLfloats.
  */
 static void FETCH(f_alpha_f16)( const struct gl_texture_image *texImage,
@@ -563,19 +442,6 @@ static void store_texel_alpha_f16(struct gl_texture_image *texImage,
 /* MESA_FORMAT_LUMINANCE_F32 *************************************************/
 
 /* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT32 texture,
- * returning 4 GLchans.
- */
-static void FETCH(luminance_f32)( const struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLchan *texel )
-{
-   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);
-   UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], src[0]);
-   texel[GCOMP] =
-   texel[BCOMP] = texel[RCOMP];
-   texel[ACOMP] = CHAN_MAX;
-}
-
-/* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT32 texture,
  * returning 4 GLfloats.
  */
 static void FETCH(f_luminance_f32)( const struct gl_texture_image *texImage,
@@ -602,19 +468,6 @@ static void store_texel_luminance_f32(struct gl_texture_image *texImage,
 /* MESA_FORMAT_LUMINANCE_F16 *************************************************/
 
 /* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT16 texture,
- * returning 4 GLchans.
- */
-static void FETCH(luminance_f16)( const struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLchan *texel )
-{
-   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
-   UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], _mesa_half_to_float(src[0]));
-   texel[GCOMP] =
-   texel[BCOMP] = texel[RCOMP];
-   texel[ACOMP] = CHAN_MAX;
-}
-
-/* Fetch texel from 1D, 2D or 3D LUMINANCE_FLOAT16 texture,
  * returning 4 GLfloats.
  */
 static void FETCH(f_luminance_f16)( const struct gl_texture_image *texImage,
@@ -641,19 +494,6 @@ static void store_texel_luminance_f16(struct gl_texture_image *texImage,
 /* MESA_FORMAT_LUMINANCE_ALPHA_F32 *******************************************/
 
 /* Fetch texel from 1D, 2D or 3D LUMINANCE_ALPHA_FLOAT32 texture,
- * returning 4 GLchans.
- */
-static void FETCH(luminance_alpha_f32)( const struct gl_texture_image *texImage,
-                                    GLint i, GLint j, GLint k, GLchan *texel )
-{
-   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 2);
-   UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], src[0]);
-   texel[GCOMP] =
-   texel[BCOMP] = texel[RCOMP];
-   UNCLAMPED_FLOAT_TO_CHAN(texel[ACOMP], src[1]);
-}
-
-/* Fetch texel from 1D, 2D or 3D LUMINANCE_ALPHA_FLOAT32 texture,
  * returning 4 GLfloats.
  */
 static void FETCH(f_luminance_alpha_f32)( const struct gl_texture_image *texImage,
@@ -683,19 +523,6 @@ static void store_texel_luminance_alpha_f32(struct gl_texture_image *texImage,
 /* Fetch texel from 1D, 2D or 3D LUMINANCE_ALPHA_FLOAT16 texture,
  * returning 4 GLfloats.
  */
-static void FETCH(luminance_alpha_f16)( const struct gl_texture_image *texImage,
-                                    GLint i, GLint j, GLint k, GLchan *texel )
-{
-   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 2);
-   UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], _mesa_half_to_float(src[0]));
-   texel[GCOMP] =
-   texel[BCOMP] = texel[RCOMP];
-   UNCLAMPED_FLOAT_TO_CHAN(texel[ACOMP], _mesa_half_to_float(src[1]));
-}
-
-/* Fetch texel from 1D, 2D or 3D LUMINANCE_ALPHA_FLOAT16 texture,
- * returning 4 GLfloats.
- */
 static void FETCH(f_luminance_alpha_f16)( const struct gl_texture_image *texImage,
                                     GLint i, GLint j, GLint k, GLfloat *texel )
 {
@@ -721,19 +548,6 @@ static void store_texel_luminance_alpha_f16(struct gl_texture_image *texImage,
 /* MESA_FORMAT_INTENSITY_F32 *************************************************/
 
 /* Fetch texel from 1D, 2D or 3D INTENSITY_FLOAT32 texture,
- * returning 4 GLchans.
- */
-static void FETCH(intensity_f32)( const struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLchan *texel )
-{
-   const GLfloat *src = TEXEL_ADDR(GLfloat, texImage, i, j, k, 1);
-   UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], src[0]);
-   texel[GCOMP] =
-   texel[BCOMP] =
-   texel[ACOMP] = texel[RCOMP];
-}
-
-/* Fetch texel from 1D, 2D or 3D INTENSITY_FLOAT32 texture,
  * returning 4 GLfloats.
  */
 static void FETCH(f_intensity_f32)( const struct gl_texture_image *texImage,
@@ -760,19 +574,6 @@ static void store_texel_intensity_f32(struct gl_texture_image *texImage,
 /* MESA_FORMAT_INTENSITY_F16 *************************************************/
 
 /* Fetch texel from 1D, 2D or 3D INTENSITY_FLOAT16 texture,
- * returning 4 GLchans.
- */
-static void FETCH(intensity_f16)( const struct gl_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLchan *texel )
-{
-   const GLhalfARB *src = TEXEL_ADDR(GLhalfARB, texImage, i, j, k, 1);
-   UNCLAMPED_FLOAT_TO_CHAN(texel[RCOMP], _mesa_half_to_float(src[0]));
-   texel[GCOMP] =
-   texel[BCOMP] =
-   texel[ACOMP] = texel[RCOMP];
-}
-
-/* Fetch texel from 1D, 2D or 3D INTENSITY_FLOAT16 texture,
  * returning 4 GLfloats.
  */
 static void FETCH(f_intensity_f16)( const struct gl_texture_image *texImage,
@@ -815,17 +616,6 @@ static void FETCH(rgba8888)( const struct gl_texture_image *texImage,
    texel[ACOMP] = UBYTE_TO_CHAN( (s      ) & 0xff );
 }
 
-/* Fetch texel from 1D, 2D or 3D rgba8888 texture, return 4 GLfloats */
-static void FETCH(f_rgba8888)( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_FLOAT( (s >> 24)        );
-   texel[GCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );
-   texel[BCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );
-   texel[ACOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );
-}
-
 #if DIM == 3
 static void store_texel_rgba8888(struct gl_texture_image *texImage,
                                  GLint i, GLint j, GLint k, const void *texel)
@@ -850,17 +640,6 @@ static void FETCH(rgba8888_rev)( const struct gl_texture_image *texImage,
    texel[ACOMP] = UBYTE_TO_CHAN( (s >> 24)        );
 }
 
-/* Fetch texel from 1D, 2D or 3D abgr8888 texture, return 4 GLfloats */
-static void FETCH(f_rgba8888_rev)( const struct gl_texture_image *texImage,
-                                   GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );
-   texel[GCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );
-   texel[BCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );
-   texel[ACOMP] = UBYTE_TO_FLOAT( (s >> 24)        );
-}
-
 #if DIM == 3
 static void store_texel_rgba8888_rev(struct gl_texture_image *texImage,
                                   GLint i, GLint j, GLint k, const void *texel)
@@ -885,17 +664,6 @@ static void FETCH(argb8888)( const struct gl_texture_image *texImage,
    texel[ACOMP] = UBYTE_TO_CHAN( (s >> 24)        );
 }
 
-/* Fetch texel from 1D, 2D or 3D argb8888 texture, return 4 GLfloats */
-static void FETCH(f_argb8888)( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );
-   texel[GCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );
-   texel[BCOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );
-   texel[ACOMP] = UBYTE_TO_FLOAT( (s >> 24)        );
-}
-
 #if DIM == 3
 static void store_texel_argb8888(struct gl_texture_image *texImage,
                                  GLint i, GLint j, GLint k, const void *texel)
@@ -920,17 +688,6 @@ static void FETCH(argb8888_rev)( const struct gl_texture_image *texImage,
    texel[ACOMP] = UBYTE_TO_CHAN( (s      ) & 0xff );
 }
 
-/* Fetch texel from 1D, 2D or 3D argb8888_rev texture, return 4 GLfloats */
-static void FETCH(f_argb8888_rev)( const struct gl_texture_image *texImage,
-                                   GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
-   texel[RCOMP] = UBYTE_TO_FLOAT( (s >>  8) & 0xff );
-   texel[GCOMP] = UBYTE_TO_FLOAT( (s >> 16) & 0xff );
-   texel[BCOMP] = UBYTE_TO_FLOAT( (s >> 24)        );
-   texel[ACOMP] = UBYTE_TO_FLOAT( (s      ) & 0xff );
-}
-
 #if DIM == 3
 static void store_texel_argb8888_rev(struct gl_texture_image *texImage,
                                   GLint i, GLint j, GLint k, const void *texel)
@@ -955,17 +712,6 @@ static void FETCH(rgb888)( const struct gl_texture_image *texImage,
    texel[ACOMP] = CHAN_MAX;
 }
 
-/* Fetch texel from 1D, 2D or 3D rgb888 texture, return 4 GLfloats */
-static void FETCH(f_rgb888)( const struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
-   texel[RCOMP] = UBYTE_TO_FLOAT( src[2] );
-   texel[GCOMP] = UBYTE_TO_FLOAT( src[1] );
-   texel[BCOMP] = UBYTE_TO_FLOAT( src[0] );
-   texel[ACOMP] = 1.0F;
-}
-
 #if DIM == 3
 static void store_texel_rgb888(struct gl_texture_image *texImage,
                                GLint i, GLint j, GLint k, const void *texel)
@@ -992,17 +738,6 @@ static void FETCH(bgr888)( const struct gl_texture_image *texImage,
    texel[ACOMP] = CHAN_MAX;
 }
 
-/* Fetch texel from 1D, 2D or 3D bgr888 texture, return 4 GLfloats */
-static void FETCH(f_bgr888)( const struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 3);
-   texel[RCOMP] = UBYTE_TO_FLOAT( src[0] );
-   texel[GCOMP] = UBYTE_TO_FLOAT( src[1] );
-   texel[BCOMP] = UBYTE_TO_FLOAT( src[2] );
-   texel[ACOMP] = 1.0F;
-}
-
 #if DIM == 3
 static void store_texel_bgr888(struct gl_texture_image *texImage,
                                GLint i, GLint j, GLint k, const void *texel)
@@ -1033,18 +768,6 @@ static void FETCH(rgb565)( const struct gl_texture_image *texImage,
    texel[ACOMP] = CHAN_MAX;
 }
 
-/* Fetch texel from 1D, 2D or 3D rgb565 texture, return 4 GLfloats */
-static void FETCH(f_rgb565)( const struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   const GLushort s = *src;
-   texel[RCOMP] = ((s >> 8) & 0xf8) * (1.0F / 248.0F);
-   texel[GCOMP] = ((s >> 3) & 0xfc) * (1.0F / 252.0F);
-   texel[BCOMP] = ((s << 3) & 0xf8) * (1.0F / 248.0F);
-   texel[ACOMP] = 1.0F;
-}
-
 #if DIM == 3
 static void store_texel_rgb565(struct gl_texture_image *texImage,
                                GLint i, GLint j, GLint k, const void *texel)
@@ -1070,18 +793,6 @@ static void FETCH(rgb565_rev)( const struct gl_texture_image *texImage,
    texel[ACOMP] = CHAN_MAX;
 }
 
-/* Fetch texel from 1D, 2D or 3D rgb565_rev texture, return 4 GLfloats */
-static void FETCH(f_rgb565_rev)( const struct gl_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   const GLushort s = (*src >> 8) | (*src << 8); /* byte swap */
-   texel[RCOMP] = ((s >> 8) & 0xf8) * (1.0F / 248.0F);
-   texel[GCOMP] = ((s >> 3) & 0xfc) * (1.0F / 252.0F);
-   texel[BCOMP] = ((s << 3) & 0xf8) * (1.0F / 248.0F);
-   texel[ACOMP] = 1.0F;
-}
-
 #if DIM == 3
 static void store_texel_rgb565_rev(struct gl_texture_image *texImage,
                                   GLint i, GLint j, GLint k, const void *texel)
@@ -1107,18 +818,6 @@ static void FETCH(argb4444)( const struct gl_texture_image *texImage,
    texel[ACOMP] = UBYTE_TO_CHAN( ((s >> 12) & 0xf) | ((s >> 8) & 0xf0) );
 }
 
-/* Fetch texel from 1D, 2D or 3D argb4444 texture, return 4 GLfloats */
-static void FETCH(f_argb4444)( const struct gl_texture_image *texImage,
-			     GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   const GLushort s = *src;
-   texel[RCOMP] = ((s >>  8) & 0xf) * (1.0F / 15.0F);
-   texel[GCOMP] = ((s >>  4) & 0xf) * (1.0F / 15.0F);
-   texel[BCOMP] = ((s      ) & 0xf) * (1.0F / 15.0F);
-   texel[ACOMP] = ((s >> 12) & 0xf) * (1.0F / 15.0F);
-}
-
 #if DIM == 3
 static void store_texel_argb4444(struct gl_texture_image *texImage,
                                  GLint i, GLint j, GLint k, const void *texel)
@@ -1143,17 +842,6 @@ static void FETCH(argb4444_rev)( const struct gl_texture_image *texImage,
    texel[ACOMP] = UBYTE_TO_CHAN( ((s >>  4) & 0xf) | ((s     ) & 0xf0) );
 }
 
-/* Fetch texel from 1D, 2D or 3D argb4444_rev texture, return 4 GLfloats */
-static void FETCH(f_argb4444_rev)( const struct gl_texture_image *texImage,
-                                   GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[RCOMP] = ((s      ) & 0xf) * (1.0F / 15.0F);
-   texel[GCOMP] = ((s >> 12) & 0xf) * (1.0F / 15.0F);
-   texel[BCOMP] = ((s >>  8) & 0xf) * (1.0F / 15.0F);
-   texel[ACOMP] = ((s >>  4) & 0xf) * (1.0F / 15.0F);
-}
-
 #if DIM == 3
 static void store_texel_argb4444_rev(struct gl_texture_image *texImage,
                                  GLint i, GLint j, GLint k, const void *texel)
@@ -1179,18 +867,6 @@ static void FETCH(argb1555)( const struct gl_texture_image *texImage,
    texel[ACOMP] = UBYTE_TO_CHAN( ((s >> 15) & 0x01) * 255 );
 }
 
-/* Fetch texel from 1D, 2D or 3D argb1555 texture, return 4 GLfloats */
-static void FETCH(f_argb1555)( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   const GLushort s = *src;
-   texel[RCOMP] = ((s >> 10) & 0x1f) * (1.0F / 31.0F);
-   texel[GCOMP] = ((s >>  5) & 0x1f) * (1.0F / 31.0F);
-   texel[BCOMP] = ((s      ) & 0x1f) * (1.0F / 31.0F);
-   texel[ACOMP] = ((s >> 15) & 0x01);
-}
-
 #if DIM == 3
 static void store_texel_argb1555(struct gl_texture_image *texImage,
                                  GLint i, GLint j, GLint k, const void *texel)
@@ -1216,18 +892,6 @@ static void FETCH(argb1555_rev)( const struct gl_texture_image *texImage,
    texel[ACOMP] = UBYTE_TO_CHAN( ((s >> 15) & 0x01) * 255 );
 }
 
-/* Fetch texel from 1D, 2D or 3D argb1555_rev texture, return 4 GLfloats */
-static void FETCH(f_argb1555_rev)( const struct gl_texture_image *texImage,
-                                   GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src = TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   const GLushort s = (*src << 8) | (*src >> 8); /* byteswap */
-   texel[RCOMP] = ((s >> 10) & 0x1f) * (1.0F / 31.0F);
-   texel[GCOMP] = ((s >>  5) & 0x1f) * (1.0F / 31.0F);
-   texel[BCOMP] = ((s      ) & 0x1f) * (1.0F / 31.0F);
-   texel[ACOMP] = ((s >> 15) & 0x01);
-}
-
 #if DIM == 3
 static void store_texel_argb1555_rev(struct gl_texture_image *texImage,
                                  GLint i, GLint j, GLint k, const void *texel)
@@ -1252,17 +916,6 @@ static void FETCH(al88)( const struct gl_texture_image *texImage,
    texel[ACOMP] = UBYTE_TO_CHAN( s >> 8 );
 }
 
-/* Fetch texel from 1D, 2D or 3D al88 texture, return 4 GLfloats */
-static void FETCH(f_al88)( const struct gl_texture_image *texImage,
-                           GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[RCOMP] = 
-   texel[GCOMP] = 
-   texel[BCOMP] = UBYTE_TO_FLOAT( s & 0xff );
-   texel[ACOMP] = UBYTE_TO_FLOAT( s >> 8 );
-}
-
 #if DIM == 3
 static void store_texel_al88(struct gl_texture_image *texImage,
                              GLint i, GLint j, GLint k, const void *texel)
@@ -1287,17 +940,6 @@ static void FETCH(al88_rev)( const struct gl_texture_image *texImage,
    texel[ACOMP] = UBYTE_TO_CHAN( s & 0xff );
 }
 
-/* Fetch texel from 1D, 2D or 3D al88_rev texture, return 4 GLfloats */
-static void FETCH(f_al88_rev)( const struct gl_texture_image *texImage,
-                               GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[RCOMP] = 
-   texel[GCOMP] = 
-   texel[BCOMP] = UBYTE_TO_FLOAT( s >> 8 );
-   texel[ACOMP] = UBYTE_TO_FLOAT( s & 0xff );
-}
-
 #if DIM == 3
 static void store_texel_al88_rev(struct gl_texture_image *texImage,
                                  GLint i, GLint j, GLint k, const void *texel)
@@ -1325,18 +967,6 @@ static void FETCH(rgb332)( const struct gl_texture_image *texImage,
    texel[ACOMP] = CHAN_MAX;
 }
 
-/* Fetch texel from 1D, 2D or 3D rgb332 texture, return 4 GLfloats */
-static void FETCH(f_rgb332)( const struct gl_texture_image *texImage,
-                             GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   const GLubyte s = *src;
-   texel[RCOMP] = ((s     ) & 0xe0) * (1.0F / 224.0F);
-   texel[GCOMP] = ((s << 3) & 0xe0) * (1.0F / 224.0F);
-   texel[BCOMP] = ((s << 6) & 0xc0) * (1.0F / 192.0F);
-   texel[ACOMP] = 1.0F;
-}
-
 #if DIM == 3
 static void store_texel_rgb332(struct gl_texture_image *texImage,
                                GLint i, GLint j, GLint k, const void *texel)
@@ -1361,17 +991,6 @@ static void FETCH(a8)( const struct gl_texture_image *texImage,
    texel[ACOMP] = UBYTE_TO_CHAN( src[0] );
 }
 
-/* Fetch texel from 1D, 2D or 3D a8 texture, return 4 GLfloats */
-static void FETCH(f_a8)( const struct gl_texture_image *texImage,
-                         GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   texel[RCOMP] = 
-   texel[GCOMP] = 
-   texel[BCOMP] = 0.0;
-   texel[ACOMP] = UBYTE_TO_FLOAT( src[0] );
-}
-
 #if DIM == 3
 static void store_texel_a8(struct gl_texture_image *texImage,
                            GLint i, GLint j, GLint k, const void *texel)
@@ -1396,17 +1015,6 @@ static void FETCH(l8)( const struct gl_texture_image *texImage,
    texel[ACOMP] = CHAN_MAX;
 }
 
-/* Fetch texel from 1D, 2D or 3D l8 texture, return 4 GLfloats */
-static void FETCH(f_l8)( const struct gl_texture_image *texImage,
-                         GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   texel[RCOMP] = 
-   texel[GCOMP] = 
-   texel[BCOMP] = UBYTE_TO_FLOAT( src[0] );
-   texel[ACOMP] = 1.0F;
-}
-
 #if DIM == 3
 static void store_texel_l8(struct gl_texture_image *texImage,
                            GLint i, GLint j, GLint k, const void *texel)
@@ -1431,17 +1039,6 @@ static void FETCH(i8)( const struct gl_texture_image *texImage,
    texel[ACOMP] = UBYTE_TO_CHAN( src[0] );
 }
 
-/* Fetch texel from 1D, 2D or 3D i8 texture, return 4 GLfloats */
-static void FETCH(f_i8)( const struct gl_texture_image *texImage,
-                         GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLubyte *src = TEXEL_ADDR(GLubyte, texImage, i, j, k, 1);
-   texel[RCOMP] = 
-   texel[GCOMP] = 
-   texel[BCOMP] = 
-   texel[ACOMP] = UBYTE_TO_FLOAT( src[0] );
-}
-
 #if DIM == 3
 static void store_texel_i8(struct gl_texture_image *texImage,
                            GLint i, GLint j, GLint k, const void *texel)
@@ -1523,23 +1120,6 @@ static void FETCH(ci8)( const struct gl_texture_image *texImage,
    }
 }
 
-
-/* Fetch CI texel from 1D, 2D or 3D ci8 texture, lookup the index in a
- * color table, and return 4 GLfloats.
- */
-static void FETCH(f_ci8)( const struct gl_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   GLchan rgba[4];
-   /* Sample as GLchan */
-   FETCH(ci8)(texImage, i, j, k, rgba);
-   /* and return as floats */
-   texel[RCOMP] = CHAN_TO_FLOAT(rgba[RCOMP]);
-   texel[GCOMP] = CHAN_TO_FLOAT(rgba[GCOMP]);
-   texel[BCOMP] = CHAN_TO_FLOAT(rgba[BCOMP]);
-   texel[ACOMP] = CHAN_TO_FLOAT(rgba[ACOMP]);
-}
-
 #if DIM == 3
 static void store_texel_ci8(struct gl_texture_image *texImage,
                             GLint i, GLint j, GLint k, const void *texel)
@@ -1584,41 +1164,6 @@ static void FETCH(ycbcr)( const struct gl_texture_image *texImage,
    texel[ACOMP] = CHAN_MAX;
 }
 
-/* Fetch texel from 1D, 2D or 3D ycbcr texture, return 4 GLfloats */
-/* We convert YCbCr to RGB here */
-static void FETCH(f_ycbcr)( const struct gl_texture_image *texImage,
-                            GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src0 = TEXEL_ADDR(GLushort, texImage, (i & ~1), j, k, 1); /* even */
-   const GLushort *src1 = src0 + 1;                               /* odd */
-   const GLubyte y0 = (*src0 >> 8) & 0xff;  /* luminance */
-   const GLubyte cb = *src0 & 0xff;         /* chroma U */
-   const GLubyte y1 = (*src1 >> 8) & 0xff;  /* luminance */
-   const GLubyte cr = *src1 & 0xff;         /* chroma V */
-   GLfloat r, g, b;
-   if (i & 1) {
-      /* odd pixel: use y1,cr,cb */
-      r = (1.164 * (y1-16) + 1.596 * (cr-128));
-      g = (1.164 * (y1-16) - 0.813 * (cr-128) - 0.391 * (cb-128));
-      b = (1.164 * (y1-16) + 2.018 * (cb-128));
-   }
-   else {
-      /* even pixel: use y0,cr,cb */
-      r = (1.164 * (y0-16) + 1.596 * (cr-128));
-      g = (1.164 * (y0-16) - 0.813 * (cr-128) - 0.391 * (cb-128));
-      b = (1.164 * (y0-16) + 2.018 * (cb-128));
-   }
-   /* XXX remove / 255 here by tweaking arithmetic above */
-   r /= 255.0;
-   g /= 255.0;
-   b /= 255.0;
-   /* XXX should we really clamp??? */
-   texel[RCOMP] = CLAMP(r, 0.0, 1.0);
-   texel[GCOMP] = CLAMP(g, 0.0, 1.0);
-   texel[BCOMP] = CLAMP(b, 0.0, 1.0);
-   texel[ACOMP] = 1.0F;
-}
-
 #if DIM == 3
 static void store_texel_ycbcr(struct gl_texture_image *texImage,
                               GLint i, GLint j, GLint k, const void *texel)
@@ -1661,41 +1206,6 @@ static void FETCH(ycbcr_rev)( const struct gl_texture_image *texImage,
    texel[ACOMP] = CHAN_MAX;
 }
 
-/* Fetch texel from 1D, 2D or 3D ycbcr_rev texture, return 4 GLfloats */
-/* We convert YCbCr to RGB here */
-static void FETCH(f_ycbcr_rev)( const struct gl_texture_image *texImage,
-                                GLint i, GLint j, GLint k, GLfloat *texel )
-{
-   const GLushort *src0 = TEXEL_ADDR(GLushort, texImage, (i & ~1), j, k, 1); /* even */
-   const GLushort *src1 = src0 + 1;                               /* odd */
-   const GLubyte y0 = *src0 & 0xff;         /* luminance */
-   const GLubyte cr = (*src0 >> 8) & 0xff;  /* chroma V */
-   const GLubyte y1 = *src1 & 0xff;         /* luminance */
-   const GLubyte cb = (*src1 >> 8) & 0xff;  /* chroma U */
-   GLfloat r, g, b;
-   if (i & 1) {
-      /* odd pixel: use y1,cr,cb */
-      r = (1.164 * (y1-16) + 1.596 * (cr-128));
-      g = (1.164 * (y1-16) - 0.813 * (cr-128) - 0.391 * (cb-128));
-      b = (1.164 * (y1-16) + 2.018 * (cb-128));
-   }
-   else {
-      /* even pixel: use y0,cr,cb */
-      r = (1.164 * (y0-16) + 1.596 * (cr-128));
-      g = (1.164 * (y0-16) - 0.813 * (cr-128) - 0.391 * (cb-128));
-      b = (1.164 * (y0-16) + 2.018 * (cb-128));
-   }
-   /* XXX remove / 255 here by tweaking arithmetic above */
-   r /= 255.0;
-   g /= 255.0;
-   b /= 255.0;
-   /* XXX should we really clamp??? */
-   texel[RCOMP] = CLAMP(r, 0.0, 1.0);
-   texel[GCOMP] = CLAMP(g, 0.0, 1.0);
-   texel[BCOMP] = CLAMP(b, 0.0, 1.0);
-   texel[ACOMP] = 1.0F;
-}
-
 #if DIM == 3
 static void store_texel_ycbcr_rev(struct gl_texture_image *texImage,
                                   GLint i, GLint j, GLint k, const void *texel)