diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-11-10 21:32:32 -0800 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-11-24 16:34:40 +0000 |
| commit | 8dbdbc21910a6d37c381535186f9e728fff8690d (patch) | |
| tree | 32819901880e1092e9f5d5054c468db1196f41c1 /src/intel/vulkan/anv_wsi.c | |
| parent | 045420ea06b6aacdaab3dbf5915c3747093e6506 (diff) | |
| download | external_mesa3d-8dbdbc21910a6d37c381535186f9e728fff8690d.zip external_mesa3d-8dbdbc21910a6d37c381535186f9e728fff8690d.tar.gz external_mesa3d-8dbdbc21910a6d37c381535186f9e728fff8690d.tar.bz2 | |
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 49f08ad77f51cc344e4bfe60ba9f8d9fccfbd753)
[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
Diffstat (limited to 'src/intel/vulkan/anv_wsi.c')
| -rw-r--r-- | src/intel/vulkan/anv_wsi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c index b95e965..c504658 100644 --- a/src/intel/vulkan/anv_wsi.c +++ b/src/intel/vulkan/anv_wsi.c @@ -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 |