fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-27 02:20:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

panvk: Keep panvk_shader alive in panvk_pipeline_shader

Browse source 
Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29161>
This commit is contained in:
Mary Guillemard 2024-05-13 10:40:12 +02:00 • committed by Marge Bot
parent a0f49428fd
commit b186220566
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/panfrost/vulkan/bifrost/panvk_pipeline.h
View file

@ -27,6 +27,7 @@
#define MAX_RTS 8
struct panvk_pipeline_shader {
struct panvk_shader *base;
struct panvk_priv_mem code;
struct panvk_priv_mem rsd;

14
src/panfrost/vulkan/bifrost/panvk_vX_pipeline.c
View file

@ -72,6 +72,7 @@ init_pipeline_shader(struct panvk_pipeline *pipeline,
pshader->code = (struct panvk_priv_mem){0};
}
pshader->base = shader;
pshader->info = shader->info;
pshader->desc_info.used_set_mask = shader->desc_info.used_set_mask;
@ -116,19 +117,22 @@ init_pipeline_shader(struct panvk_pipeline *pipeline,
}
}
panvk_per_arch(shader_destroy)(dev, shader, alloc);
return VK_SUCCESS;
}
static void
cleanup_pipeline_shader(struct panvk_pipeline *pipeline,
struct panvk_pipeline_shader *pshader)
struct panvk_pipeline_shader *pshader,
const VkAllocationCallbacks *alloc)
{
struct panvk_device *dev = to_panvk_device(pipeline->base.device);
panvk_pool_free_mem(&dev->mempools.exec, pshader->code);
panvk_pool_free_mem(&dev->mempools.rw, pshader->rsd);
panvk_pool_free_mem(&dev->mempools.rw, pshader->desc_info.others.map);
if (pshader->base != NULL)
panvk_per_arch(shader_destroy)(dev, pshader->base, alloc);
}
static mali_pixel_format
@ -487,13 +491,13 @@ panvk_per_arch(DestroyPipeline)(VkDevice _device, VkPipeline _pipeline,
struct panvk_graphics_pipeline *gfx_pipeline =
panvk_pipeline_to_graphics_pipeline(pipeline);
cleanup_pipeline_shader(pipeline, &gfx_pipeline->vs);
cleanup_pipeline_shader(pipeline, &gfx_pipeline->fs);
cleanup_pipeline_shader(pipeline, &gfx_pipeline->vs, pAllocator);
cleanup_pipeline_shader(pipeline, &gfx_pipeline->fs, pAllocator);
} else {
struct panvk_compute_pipeline *compute_pipeline =
panvk_pipeline_to_compute_pipeline(pipeline);
cleanup_pipeline_shader(pipeline, &compute_pipeline->cs);
cleanup_pipeline_shader(pipeline, &compute_pipeline->cs, pAllocator);
}
vk_object_free(&device->vk, pAllocator, pipeline);