summaryrefslogtreecommitdiff
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-03-13 08:36:51 -0600
committerBrian Paul <brianp@vmware.com>2009-03-13 08:46:03 -0600
commit4681a1d1eeb2aa8dfaf3af02c37e9ccd9a523565 (patch)
treef28f6d7205a98ebb48a8f3b57f2358de0d6b5611 /src/mesa/main
parent8132405d52f0a631056abff4a98abe0bd0f0608d (diff)
mesa: added 1D/3D fetch_texel functions for DUDV8
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/texformat.c6
-rw-r--r--src/mesa/main/texformat_tmp.h7
2 files changed, 5 insertions, 8 deletions
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 61a12493a6..c372b49398 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 d5f0b761e7..0f6a172ef0 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 *********************************************************/