From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Tue, 12 May 2020 13:01:16 +0000 (+0200)
Subject: zink: disable vkCmdResolveImage when respecting render-condition
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2eb180db94830a70e21770e3a972efc55ee8385a;p=mesa.git

zink: disable vkCmdResolveImage when respecting render-condition

vkCmdResolveImage doesn't respect render-condition, so let's fall back
to blitter in this case instead.

Fixes: 80d7cc6f129 ("zink: enable conditional rendering if available")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5008>
---

diff --git a/src/gallium/drivers/zink/zink_blit.c b/src/gallium/drivers/zink/zink_blit.c
index d02d369514d..8accc0c7286 100644
--- a/src/gallium/drivers/zink/zink_blit.c
+++ b/src/gallium/drivers/zink/zink_blit.c
@@ -12,7 +12,8 @@ blit_resolve(struct zink_context *ctx, const struct pipe_blit_info *info)
    if (util_format_get_mask(info->dst.format) != info->mask ||
        util_format_get_mask(info->src.format) != info->mask ||
        info->scissor_enable ||
-       info->alpha_blend)
+       info->alpha_blend ||
+       info->render_condition_enable)
       return false;
 
    struct zink_resource *src = zink_resource(info->src.resource);