From: Eric Anholt <eric@anholt.net>
Date: Mon, 7 Dec 2015 23:18:59 +0000 (-0800)
Subject: vc4: Allow RCL blits to the edge of the surface.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bf92017ace970104b24219fad0ce5b51bc4509b5;p=mesa.git

vc4: Allow RCL blits to the edge of the surface.

The recent unaligned fix successfully prevented RCL blits that weren't
aligned inside of the surface, but we also want to be able to do RCL blits
for the whole surface when the width or height of the surface aren't
aligned (we don't care what renders inside of the padding).
---

diff --git a/src/gallium/drivers/vc4/vc4_blit.c b/src/gallium/drivers/vc4/vc4_blit.c
index 2aed5401f59..757583c3ff7 100644
--- a/src/gallium/drivers/vc4/vc4_blit.c
+++ b/src/gallium/drivers/vc4/vc4_blit.c
@@ -70,10 +70,16 @@ vc4_tile_blit(struct pipe_context *pctx, const struct pipe_blit_info *info)
                 return false;
         }
 
+        int dst_surface_width = u_minify(info->dst.resource->width0,
+                                         info->dst.level);
+        int dst_surface_height = u_minify(info->dst.resource->height0,
+                                         info->dst.level);
         if (is_tile_unaligned(info->dst.box.x, tile_width) ||
             is_tile_unaligned(info->dst.box.y, tile_height) ||
-            is_tile_unaligned(info->dst.box.width, tile_width) ||
-            is_tile_unaligned(info->dst.box.height, tile_height)) {
+            (is_tile_unaligned(info->dst.box.width, tile_width) &&
+             info->dst.box.x + info->dst.box.width != dst_surface_width) ||
+            (is_tile_unaligned(info->dst.box.height, tile_height) &&
+             info->dst.box.y + info->dst.box.height != dst_surface_height)) {
                 return false;
         }