Module: Mesa Branch: main Commit: 104040b5c7135403194005951e57197ef76438a6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=104040b5c7135403194005951e57197ef76438a6
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> --- src/gallium/drivers/zink/zink_context.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index b667cfff67d..f7a5ce2b9a4 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -1814,8 +1814,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);
