diff options
| author | Jason Ekstrand <[email protected]> | 2016-11-10 21:32:32 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-11-16 20:07:23 -0800 |
| commit | 49f08ad77f51cc344e4bfe60ba9f8d9fccfbd753 (patch) | |
| tree | 6c4d7b7776e4ef4bd1a6880943e466e80c7f3058 /src/intel/vulkan/anv_query.c | |
| parent | d0646c8015015b90bcc933e23bdd927cc0c81bb7 (diff) | |
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" <[email protected]>
Reviewed-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/intel/vulkan/anv_query.c')
| -rw-r--r-- | src/intel/vulkan/anv_query.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/intel/vulkan/anv_query.c b/src/intel/vulkan/anv_query.c index 4afdaaf3679..293257b22f9 100644 --- a/src/intel/vulkan/anv_query.c +++ b/src/intel/vulkan/anv_query.c @@ -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); |