projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
anv/pipeline: Handle depth/stencil self-dependencies
[mesa.git]
/
src
/
intel
/
vulkan
/
anv_query.c
diff --git
a/src/intel/vulkan/anv_query.c
b/src/intel/vulkan/anv_query.c
index e45b519c0f3438313b6e0900f40706f306280fe9..293257b22f9dc4446369c68db4dff5e6f94f108b 100644
(file)
--- a/
src/intel/vulkan/anv_query.c
+++ b/
src/intel/vulkan/anv_query.c
@@
-54,7
+54,7
@@
VkResult anv_CreateQueryPool(
}
slot_size = sizeof(struct anv_query_pool_slot);
}
slot_size = sizeof(struct anv_query_pool_slot);
- pool =
anv
_alloc2(&device->alloc, pAllocator, sizeof(*pool), 8,
+ pool =
vk
_alloc2(&device->alloc, pAllocator, sizeof(*pool), 8,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (pool == NULL)
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (pool == NULL)
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@
-74,7
+74,7
@@
VkResult anv_CreateQueryPool(
return VK_SUCCESS;
fail:
return VK_SUCCESS;
fail:
-
anv
_free2(&device->alloc, pAllocator, pool);
+
vk
_free2(&device->alloc, pAllocator, pool);
return result;
}
return result;
}
@@
-87,9
+87,12
@@
void anv_DestroyQueryPool(
ANV_FROM_HANDLE(anv_device, device, _device);
ANV_FROM_HANDLE(anv_query_pool, pool, _pool);
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);
anv_gem_munmap(pool->bo.map, pool->bo.size);
anv_gem_close(device, pool->bo.gem_handle);
-
anv
_free2(&device->alloc, pAllocator, pool);
+
vk
_free2(&device->alloc, pAllocator, pool);
}
VkResult anv_GetQueryPoolResults(
}
VkResult anv_GetQueryPoolResults(