fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 06:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

anv: fixup error path for shader allocation

Browse source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: d39e443ef8 ("anv: add infrastructure for common vk_pipeline")
Acked-by: Michael Cheng <michael.cheng@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38869>
This commit is contained in:
Lionel Landwerlin 2025-12-05 22:02:12 +02:00 • committed by Marge Bot
parent 567c1b3af4
commit 7cc9d8eec7
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/intel/vulkan/anv_shader.c
View file

@ -686,7 +686,7 @@ anv_shader_create(struct anv_device *device,
result = anv_shader_reloc(device, shader_data->code, shader, pAllocator);
if (result != VK_SUCCESS)
goto error_embedded_samplers;
goto error_state;
memcpy(shader->kernel.map, shader_data->code,
shader_data->prog_data.base.program_size);
@ -703,7 +703,7 @@ anv_shader_create(struct anv_device *device,
anv_reloc_list_init(&shader->relocs, &device->vk.alloc,
device->physical->uses_relocs);
if (result != VK_SUCCESS)
goto error_embedded_samplers;
goto error_state;
struct anv_batch batch = {};
anv_batch_set_storage(&batch, ANV_NULL_ADDRESS,
@ -716,13 +716,13 @@ anv_shader_create(struct anv_device *device,
return VK_SUCCESS;
error_state:
ANV_DMR_SP_FREE(&device->vk.base, &device->instruction_state_pool, shader->kernel);
anv_state_pool_free(&device->instruction_state_pool, shader->kernel);
error_embedded_samplers:
for (uint32_t s = 0; s < shader->bind_map.embedded_sampler_count; s++)
anv_embedded_sampler_unref(device, shader->embedded_samplers[s]);
ANV_DMR_SP_FREE(&device->vk.base, &device->instruction_state_pool, shader->kernel);
anv_state_pool_free(&device->instruction_state_pool, shader->kernel);
error_shader:
anv_state_pool_free(&device->instruction_state_pool, shader->kernel);
vk_shader_free(&device->vk, pAllocator, &shader->vk);
return result;
}