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

adaptor functions.

1 files changed, 130 insertions, 123 deletions

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 878a10bb7c..794dea313a 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 */
 };