Module: Mesa Branch: staging/22.3 Commit: 064e5a0daafe4eed7306d9d5dbbfe34b81637c45 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=064e5a0daafe4eed7306d9d5dbbfe34b81637c45
Author: SoroushIMG <[email protected]> Date: Sun Feb 5 17:31:47 2023 +0000 zink: fix leak when rebinding same image surface simple way to reproduce this is to run these 4 together: KHR-GL46.gpu_shader5.images_array_indexing KHR-GL46.shader_image_load_store.advanced-allMips KHR-GL46.shader_image_load_store.advanced-sso-simple KHR-GL46.shader_image_load_store.incomplete_textures cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21134> (cherry picked from commit 104040b5c7135403194005951e57197ef76438a6) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_context.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0fecd38523c..89c60a98678 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -310,7 +310,7 @@ "description": "zink: fix leak when rebinding same image surface", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 0cbb0ccadba..3360ae9dea5 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -1737,8 +1737,11 @@ zink_set_shader_images(struct pipe_context *pctx, res->image_bind_count[p_stage == MESA_SHADER_COMPUTE]++; update_res_bind_count(ctx, res, p_stage == MESA_SHADER_COMPUTE, false); unbind_shader_image(ctx, p_stage, start_slot + i); + image_view->surface = surface; + } else { + /* create_image_surface will always increment ref */ + zink_surface_reference(zink_screen(ctx->base.screen), &surface, NULL); } - image_view->surface = surface; finalize_image_bind(ctx, res, p_stage == MESA_SHADER_COMPUTE); zink_batch_resource_usage_set(&ctx->batch, res, zink_resource_access_is_write(access), false);
