fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300g: Clean up texture formats.

Browse source
This commit is contained in:
Corbin Simpson 2009-10-06 15:30:39 -07:00
parent 3f928b3552
commit 05fc9cdfdf
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/r300/r300_screen.c
View file

@ -215,10 +215,8 @@ static boolean check_tex_2d_format(enum pipe_format format, uint32_t usage,
PIPE_TEXTURE_USAGE_PRIMARY | PIPE_TEXTURE_USAGE_PRIMARY |
PIPE_TEXTURE_USAGE_SAMPLER); PIPE_TEXTURE_USAGE_SAMPLER);
/* Z buffer */ /* Z buffer or texture */
case PIPE_FORMAT_Z16_UNORM: case PIPE_FORMAT_Z16_UNORM:
return usage & PIPE_TEXTURE_USAGE_DEPTH_STENCIL;
/* Z buffer with stencil or texture */ /* Z buffer with stencil or texture */
case PIPE_FORMAT_Z24S8_UNORM: case PIPE_FORMAT_Z24S8_UNORM:
return usage & return usage &

1
src/gallium/drivers/r300/r300_state_inlines.h
View file

@ -295,7 +295,6 @@ static INLINE uint32_t r300_translate_colorformat(enum pipe_format format)
case PIPE_FORMAT_X8R8G8B8_UNORM: case PIPE_FORMAT_X8R8G8B8_UNORM:
case PIPE_FORMAT_R8G8B8A8_UNORM: case PIPE_FORMAT_R8G8B8A8_UNORM:
case PIPE_FORMAT_R8G8B8X8_UNORM: case PIPE_FORMAT_R8G8B8X8_UNORM:
case PIPE_FORMAT_Z24S8_UNORM:
return R300_COLOR_FORMAT_ARGB8888; return R300_COLOR_FORMAT_ARGB8888;
/* XXX Not in pipe_format /* XXX Not in pipe_format
case PIPE_FORMAT_A32R32G32B32: case PIPE_FORMAT_A32R32G32B32:

13
src/gallium/drivers/r300/r300_texture.h
View file

@ -43,6 +43,14 @@ static INLINE uint32_t r300_translate_texformat(enum pipe_format format)
/* X8 */ /* X8 */
case PIPE_FORMAT_I8_UNORM: case PIPE_FORMAT_I8_UNORM:
return R300_EASY_TX_FORMAT(X, X, X, X, X8); return R300_EASY_TX_FORMAT(X, X, X, X, X8);
/* X16 */
case PIPE_FORMAT_R16_UNORM:
return R300_EASY_TX_FORMAT(X, X, X, X, X16);
case PIPE_FORMAT_R16_SNORM:
return R300_EASY_TX_FORMAT(X, X, X, X, X16) |
R300_TX_FORMAT_SIGNED;
case PIPE_FORMAT_Z16_UNORM:
return R300_EASY_TX_FORMAT(X, X, X, X, X16);
/* W8Z8Y8X8 */ /* W8Z8Y8X8 */
case PIPE_FORMAT_A8R8G8B8_UNORM: case PIPE_FORMAT_A8R8G8B8_UNORM:
return R300_EASY_TX_FORMAT(X, Y, Z, W, W8Z8Y8X8); return R300_EASY_TX_FORMAT(X, Y, Z, W, W8Z8Y8X8);
@ -76,11 +84,6 @@ static INLINE uint32_t r300_translate_texformat(enum pipe_format format)
/* W24_FP */ /* W24_FP */
case PIPE_FORMAT_Z24S8_UNORM: case PIPE_FORMAT_Z24S8_UNORM:
return R300_EASY_TX_FORMAT(X, X, X, X, W24_FP); return R300_EASY_TX_FORMAT(X, X, X, X, W24_FP);
/* Z5_Y6_X5 */
case PIPE_FORMAT_R16_SNORM:
return R300_EASY_TX_FORMAT(X, X, X, X, Z5Y6X5);
case PIPE_FORMAT_Z16_UNORM:
return R300_EASY_TX_FORMAT(X, X, X, X, X16);
default: default:
debug_printf("r300: Implementation error: " debug_printf("r300: Implementation error: "
"Got unsupported texture format %s in %s\n", "Got unsupported texture format %s in %s\n",