Mesa (main): zink: don't try to start a renderpass before CmdClearAttachments

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Fri Jul 15 10:07:52 2022 -0400

zink: don't try to start a renderpass before CmdClearAttachments

it should be impossible to reach this point if a renderpass is not active

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17640>

---

 src/gallium/drivers/zink/zink_clear.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_clear.c b/src/gallium/drivers/zink/zink_clear.c
index 26ba2c1da8e..c3d355e1b97 100644
--- a/src/gallium/drivers/zink/zink_clear.c
+++ b/src/gallium/drivers/zink/zink_clear.c
@@ -101,7 +101,7 @@ clear_in_rp(struct pipe_context *pctx,
    cr.baseArrayLayer = 0;
    cr.layerCount = util_framebuffer_get_num_layers(fb);
    struct zink_batch *batch = &ctx->batch;
-   zink_batch_rp(ctx);
+   assert(batch->in_rp);
    VKCTX(CmdClearAttachments)(batch->state->cmdbuf, num_attachments, attachments, 1, &cr);
    /*
        Rendering within a subpass containing a feedback loop creates a data race, except in the following