Mesa (master): mesa: added 1D/3D fetch_texel functions for DUDV8
Brian Paul
brianp at kemper.freedesktop.org
Fri Mar 13 14:48:12 UTC 2009
Module: Mesa
Branch: master
Commit: 4681a1d1eeb2aa8dfaf3af02c37e9ccd9a523565
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4681a1d1eeb2aa8dfaf3af02c37e9ccd9a523565
Author: Brian Paul <brianp at vmware.com>
Date: Fri Mar 13 08:36:51 2009 -0600
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(-)
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 61a1249..c372b49 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 d5f0b76..0f6a172 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 *********************************************************/
More information about the mesa-commit
mailing list