mesa: added 1D/3D fetch_texel functions for DUDV8

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 61a12493a6bc7fce4cfea0eab9142affb4be6503..c372b49398a31dde7c88d079d8efb5b8a310ec05 100644 (file)
--- 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 d5f0b761e7d8930b939a1bde3f7f7154e456da0b..0f6a172ef00591a489b547cdeb10a2b1c3cc5e8a 100644 (file)
--- 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 *********************************************************/