r300g: implement accelerated copy_region for compressed formats

diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c
index 3fa1504ecd90f96100d934c4e8d044e4e5addec4..14c9794888cb3d935b4cd88815275ccf4b39004e 100644 (file)
--- a/src/gallium/drivers/r300/r300_blit.c
+++ b/src/gallium/drivers/r300/r300_blit.c
@@ -418,6 +418,7 @@ static void r300_resource_copy_region(struct pipe_context *pipe,
     struct pipe_resource new_dst = old_dst;
     const struct util_format_description *desc =
             util_format_description(dst->format);
+    struct pipe_box box;
 
     if (r300->zmask_in_use && !r300->zmask_locked) {
         if (fb->zsbuf->texture == src ||
@@ -429,6 +430,7 @@ static void r300_resource_copy_region(struct pipe_context *pipe,
         }
     }
 
+    /* Handle non-renderable plain formats. */
     if (desc->layout == UTIL_FORMAT_LAYOUT_PLAIN &&
         (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB ||
          !pipe->screen->is_format_supported(pipe->screen,
@@ -460,6 +462,33 @@ static void r300_resource_copy_region(struct pipe_context *pipe,
         new_src.format = new_dst.format;
     }
 
+    /* Handle compressed formats. */
+    if (desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
+        switch (util_format_get_blocksize(old_dst.format)) {
+        case 8:
+            /* 1 pixel = 4 bits,
+             * we set 1 pixel = 2 bytes ===> 4 times larger pixels. */
+            new_dst.format = PIPE_FORMAT_B4G4R4A4_UNORM;
+            break;
+        case 16:
+            /* 1 pixel = 8 bits,
+             * we set 1 pixel = 4 bytes ===> 4 times larger pixels. */
+            new_dst.format = PIPE_FORMAT_B8G8R8A8_UNORM;
+            break;
+        }
+
+        /* Since the pixels are 4 times larger, we must decrease
+         * the image size and the coordinates 4 times. */
+        new_src.format = new_dst.format;
+        new_dst.height0 /= 4;
+        new_src.height0 /= 4;
+        dsty /= 4;
+        box = *src_box;
+        box.y /= 4;
+        box.height /= 4;
+        src_box = &box;
+    }
+
     if (old_src.format != new_src.format)
         r300_resource_set_properties(pipe->screen, src, 0, &new_src);
     if (old_dst.format != new_dst.format)