Module: Mesa Branch: master Commit: 347b1edb10b4cfccc714033e357a03c9b9a58367 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=347b1edb10b4cfccc714033e357a03c9b9a58367
Author: Michel Dänzer <daen...@vmware.com> Date: Sun Aug 30 12:37:11 2009 +0200 r300g: Support Z16 texture format. --- src/gallium/drivers/r300/r300_screen.c | 2 -- src/gallium/drivers/r300/r300_texture.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index 15740f6..bc8a9d7 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -219,8 +219,6 @@ static boolean check_tex_2d_format(enum pipe_format format, uint32_t usage, /* Z buffer */ case PIPE_FORMAT_Z16_UNORM: - return usage & PIPE_TEXTURE_USAGE_DEPTH_STENCIL; - /* Z buffer with stencil or texture */ case PIPE_FORMAT_Z24S8_UNORM: return usage & diff --git a/src/gallium/drivers/r300/r300_texture.h b/src/gallium/drivers/r300/r300_texture.h index 3b56f03..e1aff53 100644 --- a/src/gallium/drivers/r300/r300_texture.h +++ b/src/gallium/drivers/r300/r300_texture.h @@ -65,6 +65,9 @@ static INLINE uint32_t r300_translate_texformat(enum pipe_format format) case PIPE_FORMAT_YCBCR: return R300_EASY_TX_FORMAT(X, Y, Z, ONE, YVYU422) | R300_TX_FORMAT_YUV_TO_RGB; + /* U16 */ + case PIPE_FORMAT_Z16_UNORM: + return R300_EASY_TX_FORMAT(X, X, X, X, X16); /* W24_FP */ case PIPE_FORMAT_Z24S8_UNORM: return R300_EASY_TX_FORMAT(X, X, X, X, W24_FP); _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit