r600g: reenable texture uploads, but keep R16_SNORM disabled

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index b7600e90eb5a51ac2f00480fa055f7f1be1708b6..ec7bd0d75cdb19d63f781915eec0a0e918b90355 100644 (file)
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -531,6 +531,9 @@ static boolean permit_hardware_blit(struct pipe_screen *screen,
                                          PIPE_BIND_SAMPLER_VIEW, 0))
                 return FALSE;
 
+       if (res->format == PIPE_FORMAT_R16_SNORM)
+                return FALSE;
+
         return TRUE;
 }
 
@@ -571,8 +574,8 @@ struct pipe_transfer* r600_texture_get_transfer(struct pipe_context *ctx,
                        PIPE_TRANSFER_UNSYNCHRONIZED)))
                 use_staging_texture = TRUE;
 
-        /*if (!permit_hardware_blit(ctx->screen, texture) ||
-            (texture->flags & R600_RESOURCE_FLAG_TRANSFER))*/
+        if (!permit_hardware_blit(ctx->screen, texture) ||
+            (texture->flags & R600_RESOURCE_FLAG_TRANSFER))
                 use_staging_texture = FALSE;
 
        trans = CALLOC_STRUCT(r600_transfer);