From ac6a26b429d70395cf6def04d2d9c8cf1bd2c964 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Mon, 3 May 2010 20:14:17 +0200 Subject: r300g: use util_format_short_name and util_format_is_plain --- src/gallium/drivers/r300/r300_blit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gallium/drivers/r300/r300_blit.c') diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c index 819d5e3f0c..85c2c14901 100644 --- a/src/gallium/drivers/r300/r300_blit.c +++ b/src/gallium/drivers/r300/r300_blit.c @@ -129,8 +129,8 @@ void r300_surface_copy(struct pipe_context* pipe, if (dst->texture->format != src->texture->format) { debug_printf("r300: Implementation error: Format mismatch in %s\n" " : src: %s dst: %s\n", __FUNCTION__, - util_format_name(src->texture->format), - util_format_name(dst->texture->format)); + util_format_short_name(src->texture->format), + util_format_short_name(dst->texture->format)); debug_assert(0); } @@ -138,7 +138,7 @@ void r300_surface_copy(struct pipe_context* pipe, old_format, src->texture->target, PIPE_BIND_RENDER_TARGET | PIPE_BIND_SAMPLER_VIEW, 0) && - util_format_description(old_format)->layout == UTIL_FORMAT_LAYOUT_PLAIN) { + util_format_is_plain(old_format)) { switch (util_format_get_blocksize(old_format)) { case 1: new_format = PIPE_FORMAT_I8_UNORM; @@ -155,7 +155,7 @@ void r300_surface_copy(struct pipe_context* pipe, default: debug_printf("r300: surface_copy: Unhandled format: %s. Falling back to software.\n" "r300: surface_copy: Software fallback doesn't work for tiled textures.\n", - util_format_name(old_format)); + util_format_short_name(old_format)); } } -- cgit v1.2.3