Mesa (main): zink: remove zink_context::curr_batch

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Oct 8 03:04:36 UTC 2021


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

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Oct  6 09:20:41 2021 -0400

zink: remove zink_context::curr_batch

this hasn't been a real value in a while and it's confusing to have
it still exist

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

---

 src/gallium/drivers/zink/zink_batch.c   | 1 -
 src/gallium/drivers/zink/zink_context.h | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_batch.c b/src/gallium/drivers/zink/zink_batch.c
index 6e259cd3c2a..582251d60a1 100644
--- a/src/gallium/drivers/zink/zink_batch.c
+++ b/src/gallium/drivers/zink/zink_batch.c
@@ -309,7 +309,6 @@ zink_start_batch(struct zink_context *ctx, struct zink_batch *batch)
    if (VKCTX(BeginCommandBuffer)(batch->state->barrier_cmdbuf, &cbbi) != VK_SUCCESS)
       debug_printf("vkBeginCommandBuffer failed\n");
 
-   batch->state->fence.batch_id = ctx->curr_batch;
    batch->state->fence.completed = false;
    if (ctx->last_fence) {
       struct zink_batch_state *last_state = zink_batch_state(ctx->last_fence);
diff --git a/src/gallium/drivers/zink/zink_context.h b/src/gallium/drivers/zink/zink_context.h
index 2dc0622fbce..caab5407de2 100644
--- a/src/gallium/drivers/zink/zink_context.h
+++ b/src/gallium/drivers/zink/zink_context.h
@@ -195,8 +195,6 @@ struct zink_context {
 
    struct pipe_device_reset_callback reset;
 
-   uint32_t curr_batch; //the current batch id
-
    simple_mtx_t batch_mtx;
    struct zink_fence *deferred_fence;
    struct zink_fence *last_fence; //the last command buffer submitted



More information about the mesa-commit mailing list