Mesa (master): zink: fall back to util_blitter for scaled resolves

[GitLab Mirror]

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

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Tue Nov 24 11:21:07 2020 +0100

zink: fall back to util_blitter for scaled resolves

Vulkan can't scale while resolving using vkCmdResolveImage. For this we
need to use util_blitter.

The reason this wasn't a problem in the past, was that glBlitFramebuffer
always set pipe_blit_info::render_condition_enable, and we always used
that to bail out to util_blitter. When the latter changed, this broke.

Fixes: 19906022e22 ("zink: more accurately track supported blits")
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7745>

---

 src/gallium/drivers/zink/zink_blit.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/drivers/zink/zink_blit.c b/src/gallium/drivers/zink/zink_blit.c
index 99d344e43ce..45d9b0ed911 100644
--- a/src/gallium/drivers/zink/zink_blit.c
+++ b/src/gallium/drivers/zink/zink_blit.c
@@ -17,6 +17,11 @@ blit_resolve(struct zink_context *ctx, const struct pipe_blit_info *info)
        info->alpha_blend)
       return false;
 
+   if (info->src.box.width != info->dst.box.width ||
+       info->src.box.height != info->dst.box.height ||
+       info->src.box.depth != info->dst.box.depth)
+      return false;
+
    if (info->render_condition_enable &&
        ctx->render_condition_active)
       return false;