Mesa (master): v3d: Don't try to use the TFU blit path if a scissor is enabled.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 4c70f276bc043f5d1a7647b8fbbb41100e051e69
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4c70f276bc043f5d1a7647b8fbbb41100e051e69

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Apr  3 12:39:54 2019 -0700

v3d: Don't try to use the TFU blit path if a scissor is enabled.

We'll need to do a render-based blit for scissors, since the TFU (as seen
in this conditional) can only update a whole surface.

Fixes: 976ea90bdca2 ("v3d: Add support for using the TFU to do some blits.")
Fixes piglit fbo-scissor-blit.

---

 src/gallium/drivers/v3d/v3d_blit.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/v3d/v3d_blit.c b/src/gallium/drivers/v3d/v3d_blit.c
index 2f36bdd46e3..d42e8fd0e69 100644
--- a/src/gallium/drivers/v3d/v3d_blit.c
+++ b/src/gallium/drivers/v3d/v3d_blit.c
@@ -491,7 +491,8 @@ v3d_tfu_blit(struct pipe_context *pctx, const struct pipe_blit_info *info)
         if ((info->mask & PIPE_MASK_RGBA) == 0)
                 return false;
 
-        if (info->dst.box.x != 0 ||
+        if (info->scissor_enable ||
+            info->dst.box.x != 0 ||
             info->dst.box.y != 0 ||
             info->dst.box.width != dst_width ||
             info->dst.box.height != dst_height ||