r600g: reenable hardware blits for STATIC and IMMUTABLE resources
authorChristian König <deathsimple@vodafone.de>
Wed, 13 Jul 2011 15:05:58 +0000 (17:05 +0200)
committerChristian König <deathsimple@vodafone.de>
Wed, 13 Jul 2011 15:05:58 +0000 (17:05 +0200)
Getting the driver in sync with mainline.

src/gallium/drivers/r600/r600_texture.c

index a6161e5f281b94103e73133bb8477cf9399994ba..10c32c53a6dd66ed2e9c60d39b9e881cc63d0111 100644 (file)
@@ -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,