From 4681a1d1eeb2aa8dfaf3af02c37e9ccd9a523565 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 13 Mar 2009 08:36:51 -0600
Subject: mesa: added 1D/3D fetch_texel functions for DUDV8

---
 src/mesa/main/texformat.c     | 6 +++---
 src/mesa/main/texformat_tmp.h | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 61a12493a6b..c372b49398a 100644
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -716,11 +716,11 @@ const struct gl_texture_format _mesa_texformat_dudv8 = {
    2,					/* TexelBytes */
    _mesa_texstore_dudv8,		/* StoreTexImageFunc */
    NULL,				/* FetchTexel1D */
-   NULL,		/* FetchTexel2D */
+   NULL,				/* FetchTexel2D */
    NULL,				/* FetchTexel3D */
-   NULL,				/* FetchTexel1Df */
+   fetch_texel_1d_dudv8,		/* FetchTexel1Df */
    fetch_texel_2d_dudv8,		/* FetchTexel2Df */
-   NULL,				/* FetchTexel3Df */
+   fetch_texel_3d_dudv8,		/* FetchTexel3Df */
    NULL					/* StoreTexel */
 };
 
diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texformat_tmp.h
index d5f0b761e7d..0f6a172ef00 100644
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texformat_tmp.h
@@ -1304,11 +1304,9 @@ static void store_texel_sla8(struct gl_texture_image *texImage,
 }
 #endif
 
-
-
 #endif /* FEATURE_EXT_texture_sRGB */
 
-#if DIM == 2
+
 /* MESA_FORMAT_DUDV8 ********************************************************/
 
 /* this format by definition produces 0,0,0,1 as rgba values,
@@ -1321,9 +1319,8 @@ static void FETCH(dudv8)(const struct gl_texture_image *texImage,
    texel[GCOMP] = BYTE_TO_FLOAT(src[1]);
    texel[BCOMP] = 0;
    texel[ACOMP] = 0;
-
 }
-#endif
+
 
 /* MESA_FORMAT_YCBCR *********************************************************/
 
-- 
cgit v1.2.3