From f35fc4ace8e8a6987b014efa3a7b226821673de6 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 18 Apr 2024 11:18:06 -0400 Subject: [PATCH] zink: destroy shaderdb pipelines cc: mesa-stable Part-of: (cherry picked from commit fd6468a5aeba0669fb8bf10f2be8a2913aaf24eb) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_program.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 08d971b04ed..74f1985d2b1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1044,7 +1044,7 @@ "description": "zink: destroy shaderdb pipelines", "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_program.c b/src/gallium/drivers/zink/zink_program.c index bec57ca2b74..58f480e8774 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -2203,6 +2203,7 @@ zink_link_gfx_shader(struct pipe_context *pctx, void **shaders) ctx->gfx_pipeline_state.element_state->binding_map, shaders[MESA_SHADER_TESS_EVAL] ? VK_PRIMITIVE_TOPOLOGY_PATCH_LIST : VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, true, NULL); print_pipeline_stats(screen, pipeline); + VKSCR(DestroyPipeline)(screen->dev, pipeline, NULL); } else { if (zink_screen(pctx->screen)->info.have_EXT_shader_object) prog->base.uses_shobj = !BITSET_TEST(zshaders[MESA_SHADER_FRAGMENT]->info.system_values_read, SYSTEM_VALUE_SAMPLE_MASK_IN);