fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-03 13:00:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

zink: don't free non-fbfetch dsl structs when switching to fbfetch

Browse source 
this triggers invalid access when recycling in-flight non-fbfetch sets

cc: mesa-stable

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15173>
(cherry picked from commit e1964e1dde)
This commit is contained in:
Mike Blumenkrantz 2022-02-23 13:46:30 -05:00 • committed by Dylan Baker
parent 65a55ea2a8
commit ee42fa621d
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2713,7 +2713,7 @@
"description": "zink: don't free non-fbfetch dsl structs when switching to fbfetch",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

5
src/gallium/drivers/zink/zink_descriptors.c
View file

@ -1787,8 +1787,9 @@ zink_descriptor_util_init_fbfetch(struct zink_context *ctx)
struct zink_screen *screen = zink_screen(ctx->base.screen);
VKSCR(DestroyDescriptorSetLayout)(screen->dev, ctx->dd->push_dsl[0]->layout, NULL);
ralloc_free(ctx->dd->push_dsl[0]);
ralloc_free(ctx->dd->push_layout_keys[0]);
//don't free these now, let ralloc free on teardown to avoid invalid access
//ralloc_free(ctx->dd->push_dsl[0]);
//ralloc_free(ctx->dd->push_layout_keys[0]);
ctx->dd->push_dsl[0] = create_gfx_layout(ctx, &ctx->dd->push_layout_keys[0], true);
ctx->dd->has_fbfetch = true;
if (screen->descriptor_mode != ZINK_DESCRIPTOR_MODE_LAZY)