diff options
| author | Christian König <deathsimple@vodafone.de> | 2011-07-13 17:05:58 +0200 |
|---|---|---|
| committer | Christian König <deathsimple@vodafone.de> | 2011-07-13 17:05:58 +0200 |
| commit | 211887c92baf25db14251ed496140207b15e0ccb (patch) | |
| tree | e4e3a7007e99bd01a22940c78e1c1993d1c4c7c4 | |
| parent | c5110a1bfab8e97b8b958d42dd294a426310d1e2 (diff) | |
r600g: reenable hardware blits for STATIC and IMMUTABLE resources
Getting the driver in sync with mainline.
| -rw-r--r-- | src/gallium/drivers/r600/r600_texture.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index a6161e5f281..10c32c53a6d 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, |