fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 09:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

radv: fix a memleak with GS copy shader NIR

Browse source 
Really need to refactor this code...

Cc: mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36317>
(cherry picked from commit 0cd745c386)
This commit is contained in:
Samuel Pitoiset 2025-07-23 15:46:55 +02:00 • committed by Eric Engestrom
parent 3d97cd6961
commit d4500d9b56
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2474,7 +2474,7 @@
"description": "radv: fix a memleak with GS copy shader NIR",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

5
src/amd/vulkan/radv_pipeline_graphics.c
View file

@ -2849,6 +2849,10 @@ radv_graphics_pipeline_state_finish(struct radv_device *device, struct radv_grap
if (gfx_state->stages) {
for (uint32_t i = 0; i < MESA_VULKAN_SHADER_STAGES; i++)
ralloc_free(gfx_state->stages[i].nir);
if (gfx_state->stages[MESA_SHADER_GEOMETRY].gs_copy_shader)
ralloc_free(gfx_state->stages[MESA_SHADER_GEOMETRY].gs_copy_shader);
free(gfx_state->stages);
}
}
@ -2915,6 +2919,7 @@ radv_generate_graphics_pipeline_state(struct radv_device *device, const VkGraphi
for (unsigned i = 0; i < MESA_VULKAN_SHADER_STAGES; i++) {
gfx_state->stages[i].stage = MESA_SHADER_NONE;
gfx_state->stages[i].nir = NULL;
gfx_state->stages[i].gs_copy_shader = NULL;
gfx_state->stages[i].spirv.size = 0;
gfx_state->stages[i].next_stage = MESA_SHADER_NONE;
}

9
src/amd/vulkan/radv_shader_object.c
View file

@ -128,6 +128,7 @@ radv_shader_object_init_graphics(struct radv_shader_object *shader_obj, struct r
for (unsigned i = 0; i < MESA_VULKAN_SHADER_STAGES; i++) {
stages[i].stage = MESA_SHADER_NONE;
stages[i].gs_copy_shader = NULL;
stages[i].nir = NULL;
stages[i].spirv.size = 0;
stages[i].next_stage = MESA_SHADER_NONE;
@ -162,6 +163,8 @@ radv_shader_object_init_graphics(struct radv_shader_object *shader_obj, struct r
binary = binaries[stage];
ralloc_free(stages[stage].nir);
if (stages[MESA_SHADER_GEOMETRY].gs_copy_shader)
ralloc_free(stages[MESA_SHADER_GEOMETRY].gs_copy_shader);
shader_obj->shader = shader;
shader_obj->binary = binary;
@ -189,6 +192,8 @@ radv_shader_object_init_graphics(struct radv_shader_object *shader_obj, struct r
binary = binaries[stage];
ralloc_free(stages[stage].nir);
if (stages[MESA_SHADER_GEOMETRY].gs_copy_shader)
ralloc_free(stages[MESA_SHADER_GEOMETRY].gs_copy_shader);
if (stage == MESA_SHADER_VERTEX) {
if (next_stage == MESA_SHADER_TESS_CTRL) {
@ -414,6 +419,7 @@ radv_shader_object_create_linked(VkDevice _device, uint32_t createInfoCount, con
for (unsigned i = 0; i < MESA_VULKAN_SHADER_STAGES; i++) {
stages[i].stage = MESA_SHADER_NONE;
stages[i].gs_copy_shader = NULL;
stages[i].nir = NULL;
stages[i].spirv.size = 0;
stages[i].next_stage = MESA_SHADER_NONE;
@ -539,6 +545,9 @@ radv_shader_object_create_linked(VkDevice _device, uint32_t createInfoCount, con
pShaders[i] = radv_shader_object_to_handle(shader_obj);
}
if (stages[MESA_SHADER_GEOMETRY].gs_copy_shader)
ralloc_free(stages[MESA_SHADER_GEOMETRY].gs_copy_shader);
return VK_SUCCESS;
}