From 211887c92baf25db14251ed496140207b15e0ccb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20K=C3=B6nig?= Date: Wed, 13 Jul 2011 17:05:58 +0200 Subject: [PATCH] r600g: reenable hardware blits for STATIC and IMMUTABLE resources Getting the driver in sync with mainline. --- src/gallium/drivers/r600/r600_texture.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index a6161e5..10c32c5 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -298,7 +298,7 @@ static boolean permit_hardware_blit(struct pipe_screen *screen, /* hackaround for S3TC */ if (util_format_is_compressed(res->format)) return TRUE; - + if (!screen->is_format_supported(screen, res->format, res->target, @@ -313,16 +313,14 @@ static boolean permit_hardware_blit(struct pipe_screen *screen, PIPE_BIND_SAMPLER_VIEW)) return FALSE; - switch (res->usage) { - case PIPE_USAGE_STREAM: - case PIPE_USAGE_STAGING: - case PIPE_USAGE_STATIC: - case PIPE_USAGE_IMMUTABLE: - return FALSE; + switch (res->usage) { + case PIPE_USAGE_STREAM: + case PIPE_USAGE_STAGING: + return FALSE; - default: - return TRUE; - } + default: + return TRUE; + } } static boolean r600_texture_get_handle(struct pipe_screen* screen, -- 2.7.4