KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

turnip: Fix issues in tu_compute_pipeline_create() that may lead to crash 

The shader object is destroyed even if its creation failed. It is also
not destroyed if its compilation or upload fails, leading to leaks.

Finally, tu_compute_pipeline_create() should set output var
pPipeline to VK_NULL_HANDLE if it fails.

Avoids crash on
dEQP-VK.api.object_management.alloc_callback_fail_multiple.compute_pipeline

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3572>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3572>
This commit is contained in:
Eduardo Lima Mitev 2020-01-26 22:25:17 +00:00 committed by Marge Bot
parent 0e11e8ba89
commit e6b531af66
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/freedreno/vulkan/tu_pipeline.c
View File

@ -2082,6 +2082,8 @@ tu_compute_pipeline_create(VkDevice device,
struct tu_pipeline *pipeline;
*pPipeline = VK_NULL_HANDLE;
result = tu_pipeline_create(dev, pAllocator, &pipeline);
if (result != VK_SUCCESS)
return result;
@ -2100,7 +2102,7 @@ tu_compute_pipeline_create(VkDevice device,
result = tu_shader_compile(dev, shader, NULL, &options, pAllocator);
if (result != VK_SUCCESS)
return result;
goto fail;
struct ir3_shader_variant *v = &shader->variants[0];
@ -2109,7 +2111,7 @@ tu_compute_pipeline_create(VkDevice device,
result = tu_compute_upload_shader(device, pipeline, shader);
if (result != VK_SUCCESS)
return result;
goto fail;
for (int i = 0; i < 3; i++)
pipeline->compute.local_size[i] = v->shader->nir->info.cs.local_size[i];
@ -2123,11 +2125,11 @@ tu_compute_pipeline_create(VkDevice device,
return VK_SUCCESS;
fail:
tu_shader_destroy(dev, shader, pAllocator);
if (result != VK_SUCCESS) {
tu_pipeline_finish(pipeline, dev, pAllocator);
vk_free2(&dev->alloc, pAllocator, pipeline);
}
if (shader)
tu_shader_destroy(dev, shader, pAllocator);
tu_pipeline_finish(pipeline, dev, pAllocator);
vk_free2(&dev->alloc, pAllocator, pipeline);
return result;
}