mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-07 11:28:05 +02:00
anv: Handle null in all destructors
This fixes a bunch of new CTS tests which look for exactly this. Even in
the cases where we just call vk_free to free a CPU data structure, we still
handle NULL explicitly. This way we're less likely to forget to handle
NULL later should we actually do something less trivial.
Cc: "13.0" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit 49f08ad77f)
[Emil Velikov: color_rt_surface_state is still around]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Conflicts:
src/intel/vulkan/anv_image.c
This commit is contained in:
parent
045420ea06
commit
8dbdbc2191
9 changed files with 65 additions and 1 deletions
|
|
@ -318,6 +318,9 @@ void anv_FreeCommandBuffers(
|
|||
for (uint32_t i = 0; i < commandBufferCount; i++) {
|
||||
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, pCommandBuffers[i]);
|
||||
|
||||
if (!cmd_buffer)
|
||||
continue;
|
||||
|
||||
anv_cmd_buffer_destroy(cmd_buffer);
|
||||
}
|
||||
}
|
||||
|
|
@ -796,6 +799,9 @@ void anv_DestroyCommandPool(
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_cmd_pool, pool, commandPool);
|
||||
|
||||
if (!pool)
|
||||
return;
|
||||
|
||||
list_for_each_entry_safe(struct anv_cmd_buffer, cmd_buffer,
|
||||
&pool->cmd_buffers, pool_link) {
|
||||
anv_cmd_buffer_destroy(cmd_buffer);
|
||||
|
|
|
|||
|
|
@ -200,6 +200,9 @@ void anv_DestroyDescriptorSetLayout(
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_descriptor_set_layout, set_layout, _set_layout);
|
||||
|
||||
if (!set_layout)
|
||||
return;
|
||||
|
||||
vk_free2(&device->alloc, pAllocator, set_layout);
|
||||
}
|
||||
|
||||
|
|
@ -282,6 +285,9 @@ void anv_DestroyPipelineLayout(
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_pipeline_layout, pipeline_layout, _pipelineLayout);
|
||||
|
||||
if (!pipeline_layout)
|
||||
return;
|
||||
|
||||
vk_free2(&device->alloc, pAllocator, pipeline_layout);
|
||||
}
|
||||
|
||||
|
|
@ -355,6 +361,9 @@ void anv_DestroyDescriptorPool(
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_descriptor_pool, pool, _pool);
|
||||
|
||||
if (!pool)
|
||||
return;
|
||||
|
||||
anv_state_stream_finish(&pool->surface_state_stream);
|
||||
vk_free2(&device->alloc, pAllocator, pool);
|
||||
}
|
||||
|
|
@ -546,6 +555,9 @@ VkResult anv_FreeDescriptorSets(
|
|||
for (uint32_t i = 0; i < count; i++) {
|
||||
ANV_FROM_HANDLE(anv_descriptor_set, set, pDescriptorSets[i]);
|
||||
|
||||
if (!set)
|
||||
continue;
|
||||
|
||||
anv_descriptor_set_destroy(device, pool, set);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1544,6 +1544,9 @@ void anv_DestroyFence(
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_fence, fence, _fence);
|
||||
|
||||
if (!fence)
|
||||
return;
|
||||
|
||||
assert(fence->bo.map == fence);
|
||||
anv_bo_pool_free(&device->batch_bo_pool, &fence->bo);
|
||||
}
|
||||
|
|
@ -1783,6 +1786,9 @@ void anv_DestroyEvent(
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_event, event, _event);
|
||||
|
||||
if (!event)
|
||||
return;
|
||||
|
||||
anv_state_pool_free(&device->dynamic_state_pool, event->state);
|
||||
}
|
||||
|
||||
|
|
@ -1875,6 +1881,9 @@ void anv_DestroyBuffer(
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_buffer, buffer, _buffer);
|
||||
|
||||
if (!buffer)
|
||||
return;
|
||||
|
||||
vk_free2(&device->alloc, pAllocator, buffer);
|
||||
}
|
||||
|
||||
|
|
@ -1902,6 +1911,9 @@ void anv_DestroySampler(
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_sampler, sampler, _sampler);
|
||||
|
||||
if (!sampler)
|
||||
return;
|
||||
|
||||
vk_free2(&device->alloc, pAllocator, sampler);
|
||||
}
|
||||
|
||||
|
|
@ -1946,5 +1958,8 @@ void anv_DestroyFramebuffer(
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_framebuffer, fb, _fb);
|
||||
|
||||
if (!fb)
|
||||
return;
|
||||
|
||||
vk_free2(&device->alloc, pAllocator, fb);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -275,8 +275,12 @@ anv_DestroyImage(VkDevice _device, VkImage _image,
|
|||
const VkAllocationCallbacks *pAllocator)
|
||||
{
|
||||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_image, image, _image);
|
||||
|
||||
vk_free2(&device->alloc, pAllocator, anv_image_from_handle(_image));
|
||||
if (!image)
|
||||
return;
|
||||
|
||||
vk_free2(&device->alloc, pAllocator, image);
|
||||
}
|
||||
|
||||
VkResult anv_BindImageMemory(
|
||||
|
|
@ -565,6 +569,9 @@ anv_DestroyImageView(VkDevice _device, VkImageView _iview,
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_image_view, iview, _iview);
|
||||
|
||||
if (!iview)
|
||||
return;
|
||||
|
||||
if (iview->color_rt_surface_state.alloc_size > 0) {
|
||||
anv_state_pool_free(&device->surface_state_pool,
|
||||
iview->color_rt_surface_state);
|
||||
|
|
@ -655,6 +662,9 @@ anv_DestroyBufferView(VkDevice _device, VkBufferView bufferView,
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_buffer_view, view, bufferView);
|
||||
|
||||
if (!view)
|
||||
return;
|
||||
|
||||
if (view->surface_state.alloc_size > 0)
|
||||
anv_state_pool_free(&device->surface_state_pool,
|
||||
view->surface_state);
|
||||
|
|
|
|||
|
|
@ -146,6 +146,9 @@ void anv_DestroyRenderPass(
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_render_pass, pass, _pass);
|
||||
|
||||
if (!pass)
|
||||
return;
|
||||
|
||||
vk_free2(&device->alloc, pAllocator, pass->subpass_attachments);
|
||||
vk_free2(&device->alloc, pAllocator, pass);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,6 +75,9 @@ void anv_DestroyShaderModule(
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_shader_module, module, _module);
|
||||
|
||||
if (!module)
|
||||
return;
|
||||
|
||||
vk_free2(&device->alloc, pAllocator, module);
|
||||
}
|
||||
|
||||
|
|
@ -189,6 +192,9 @@ void anv_DestroyPipeline(
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_pipeline, pipeline, _pipeline);
|
||||
|
||||
if (!pipeline)
|
||||
return;
|
||||
|
||||
anv_reloc_list_finish(&pipeline->batch_relocs,
|
||||
pAllocator ? pAllocator : &device->alloc);
|
||||
if (pipeline->blend_state.map)
|
||||
|
|
|
|||
|
|
@ -454,6 +454,9 @@ void anv_DestroyPipelineCache(
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_pipeline_cache, cache, _cache);
|
||||
|
||||
if (!cache)
|
||||
return;
|
||||
|
||||
anv_pipeline_cache_finish(cache);
|
||||
|
||||
vk_free2(&device->alloc, pAllocator, cache);
|
||||
|
|
|
|||
|
|
@ -87,6 +87,9 @@ void anv_DestroyQueryPool(
|
|||
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||
ANV_FROM_HANDLE(anv_query_pool, pool, _pool);
|
||||
|
||||
if (!pool)
|
||||
return;
|
||||
|
||||
anv_gem_munmap(pool->bo.map, pool->bo.size);
|
||||
anv_gem_close(device, pool->bo.gem_handle);
|
||||
vk_free2(&device->alloc, pAllocator, pool);
|
||||
|
|
|
|||
|
|
@ -76,6 +76,9 @@ void anv_DestroySurfaceKHR(
|
|||
ANV_FROM_HANDLE(anv_instance, instance, _instance);
|
||||
ANV_FROM_HANDLE(_VkIcdSurfaceBase, surface, _surface);
|
||||
|
||||
if (!surface)
|
||||
return;
|
||||
|
||||
vk_free2(&instance->alloc, pAllocator, surface);
|
||||
}
|
||||
|
||||
|
|
@ -294,6 +297,9 @@ void anv_DestroySwapchainKHR(
|
|||
ANV_FROM_HANDLE(wsi_swapchain, swapchain, _swapchain);
|
||||
const VkAllocationCallbacks *alloc;
|
||||
|
||||
if (!swapchain)
|
||||
return;
|
||||
|
||||
if (pAllocator)
|
||||
alloc = pAllocator;
|
||||
else
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue