From 0029979eee6ef537592c7bb6b6005fa2ef0729da Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 28 Jan 2011 17:15:22 +0100 Subject: [PATCH] r300g: fix resource_copy_region for DXT SRGB formats --- src/gallium/drivers/r300/r300_blit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c index d0eb21c..69f8115 100644 --- a/src/gallium/drivers/r300/r300_blit.c +++ b/src/gallium/drivers/r300/r300_blit.c @@ -426,13 +426,13 @@ static void r300_resource_copy_region(struct pipe_context *pipe, } } - if (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB || - (!pipe->screen->is_format_supported(pipe->screen, + if (desc->layout == UTIL_FORMAT_LAYOUT_PLAIN && + (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB || + !pipe->screen->is_format_supported(pipe->screen, old_format, src->target, src->nr_samples, PIPE_BIND_RENDER_TARGET | - PIPE_BIND_SAMPLER_VIEW, 0) && - desc->layout == UTIL_FORMAT_LAYOUT_PLAIN)) { + PIPE_BIND_SAMPLER_VIEW, 0))) { switch (util_format_get_blocksize(old_format)) { case 1: new_format = PIPE_FORMAT_I8_UNORM; -- 2.7.4