summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_blit.c
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-01-28 17:15:22 +0100
committerMarek Olšák <maraeo@gmail.com>2011-01-28 17:15:22 +0100
commit0029979eee6ef537592c7bb6b6005fa2ef0729da (patch)
tree62d169e41f538958c0a11f0b4c350d7e68888918 /src/gallium/drivers/r300/r300_blit.c
parentd3df641f0aba99b0b65ecd4d9b06798bca090a29 (diff)
downloadexternal_mesa3d-0029979eee6ef537592c7bb6b6005fa2ef0729da.zip
external_mesa3d-0029979eee6ef537592c7bb6b6005fa2ef0729da.tar.gz
external_mesa3d-0029979eee6ef537592c7bb6b6005fa2ef0729da.tar.bz2
r300g: fix resource_copy_region for DXT SRGB formats
Diffstat (limited to 'src/gallium/drivers/r300/r300_blit.c')
-rw-r--r--src/gallium/drivers/r300/r300_blit.c8
1 files 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;