diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2024-05-09 11:28:17 -0400 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2024-05-13 11:12:34 +0200 |
| commit | abf8b28b651080cc0e36336a2222ff400d4df453 (patch) | |
| tree | 261d72a1ce12ba1afa4568f8e4e80c6ef67cb512 | |
| parent | 9eb14991f939ab81d1da0d6ed248c9ca2595efc6 (diff) | |
zink: clean up semaphore arrays on batch state destroystaging/24.0
cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29152>
(cherry picked from commit 604573cf0a81c499667bb107b42c25e21bfa98db)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_batch.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 76502ac3980..01bab5f67ff 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -44,7 +44,7 @@ "description": "zink: clean up semaphore arrays on batch state destroy", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_batch.c b/src/gallium/drivers/zink/zink_batch.c index e774d1f7c5b..b8abb68e53d 100644 --- a/src/gallium/drivers/zink/zink_batch.c +++ b/src/gallium/drivers/zink/zink_batch.c @@ -309,6 +309,11 @@ zink_batch_state_destroy(struct zink_screen *screen, struct zink_batch_state *bs util_dynarray_fini(&bs->bindless_releases[0]); util_dynarray_fini(&bs->bindless_releases[1]); util_dynarray_fini(&bs->acquires); + util_dynarray_fini(&bs->signal_semaphores); + util_dynarray_fini(&bs->wait_semaphores); + util_dynarray_fini(&bs->wait_semaphore_stages); + util_dynarray_fini(&bs->fd_wait_semaphores); + util_dynarray_fini(&bs->fd_wait_semaphore_stages); util_dynarray_fini(&bs->acquire_flags); unsigned num_mfences = util_dynarray_num_elements(&bs->fence.mfences, void *); struct zink_tc_fence **mfence = bs->fence.mfences.data; |