diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2021-03-22 11:28:07 -0400 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-03-30 15:12:59 +0000 |
| commit | ef538e50c84ae606496c6d99a8185feb5ec25402 (patch) | |
| tree | f5b33b4e152abd74f7a0b61e35ce2be3d74755b2 | |
| parent | 95af27f03243ec21480867b80a0343f19d26e20b (diff) | |
zink: remove zink_fence_init()
contents moved to more correct places
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9885>
| -rw-r--r-- | src/gallium/drivers/zink/zink_batch.c | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_fence.c | 10 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_fence.h | 2 |
3 files changed, 3 insertions, 14 deletions
diff --git a/src/gallium/drivers/zink/zink_batch.c b/src/gallium/drivers/zink/zink_batch.c index ae0dc4599ad..0bed629951a 100644 --- a/src/gallium/drivers/zink/zink_batch.c +++ b/src/gallium/drivers/zink/zink_batch.c @@ -82,6 +82,7 @@ zink_reset_batch_state(struct zink_context *ctx, struct zink_batch_state *bs) } bs->flush_res = NULL; + bs->fence.deferred_ctx = NULL; bs->descs_used = 0; ctx->resource_size -= bs->resource_size; @@ -267,8 +268,7 @@ zink_end_batch(struct zink_context *ctx, struct zink_batch *batch) debug_printf("vkEndCommandBuffer failed\n"); return; } - - zink_fence_init(ctx, batch); + vkResetFences(zink_screen(ctx->base.screen)->dev, 1, &batch->state->fence.fence); util_dynarray_foreach(&batch->state->persistent_resources, struct zink_resource*, res) { struct zink_screen *screen = zink_screen(ctx->base.screen); @@ -311,6 +311,7 @@ zink_end_batch(struct zink_context *ctx, struct zink_batch *batch) ctx->reset.reset(ctx->reset.data, PIPE_GUILTY_CONTEXT_RESET); } } + batch->state->fence.submitted = true; simple_mtx_lock(&ctx->batch_mtx); ctx->last_fence = &batch->state->fence; _mesa_hash_table_insert_pre_hashed(&ctx->batch_states, batch->state->fence.batch_id, (void*)(uintptr_t)batch->state->fence.batch_id, batch->state); diff --git a/src/gallium/drivers/zink/zink_fence.c b/src/gallium/drivers/zink/zink_fence.c index 12d61f8c394..3a76bddc237 100644 --- a/src/gallium/drivers/zink/zink_fence.c +++ b/src/gallium/drivers/zink/zink_fence.c @@ -76,16 +76,6 @@ fail: } void -zink_fence_init(struct zink_context *ctx, struct zink_batch *batch) -{ - struct zink_fence *fence = zink_fence(batch->state); - - vkResetFences(zink_screen(ctx->base.screen)->dev, 1, &fence->fence); - fence->deferred_ctx = NULL; - fence->submitted = true; -} - -void zink_fence_reference(struct zink_screen *screen, struct zink_fence **ptr, struct zink_fence *fence) diff --git a/src/gallium/drivers/zink/zink_fence.h b/src/gallium/drivers/zink/zink_fence.h index f4b2a8d97cc..c35a5f1c327 100644 --- a/src/gallium/drivers/zink/zink_fence.h +++ b/src/gallium/drivers/zink/zink_fence.h @@ -52,8 +52,6 @@ zink_fence(void *pfence) return (struct zink_fence *)pfence; } -void -zink_fence_init(struct zink_context *ctx, struct zink_batch *batch); bool zink_create_fence(struct zink_screen *screen, struct zink_batch_state *bs); |