Mesa (master): zink: just end the current renderpass in zink_batch_no_rp()

[GitLab Mirror]

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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Tue Sep  8 13:00:49 2020 -0400

zink: just end the current renderpass in zink_batch_no_rp()

since we aren't (currently) parallelizing and now have barriers, we don't need to cycle
the batch here, which lets us avoid submitting too-small command buffers

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

---

 src/gallium/drivers/zink/zink_context.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 216dd61bea0..ae76e62dd1b 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -891,12 +891,8 @@ struct zink_batch *
 zink_batch_no_rp(struct zink_context *ctx)
 {
    struct zink_batch *batch = zink_curr_batch(ctx);
-   if (batch->in_rp) {
-      /* flush batch and get a new one */
-      flush_batch(ctx);
-      batch = zink_curr_batch(ctx);
-      assert(!batch->in_rp);
-   }
+   zink_end_render_pass(ctx, batch);
+   assert(!batch->in_rp);
    return batch;
 }