OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Check if vkCreateQueryPool() is being created in a supported queue

Browse Source 
Turns out not even VK CTS was calling
vkEnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR()
to check if queue supports query.
So here adding a explicity check in our implementation of
vkCreateQueryPool().

https://github.com/KhronosGroup/VK-GL-CTS/pull/482

Cc: 24.2 <mesa-stable>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30652>
This commit is contained in:
José Roberto de Souza
2024-08-30 13:00:09 -07:00
committed by Marge Bot
parent 141e7eaca7
commit dec5a624e9
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/intel/vulkan/genX_query.c
View File

@@ -146,9 +146,15 @@ VkResult genX(CreateQueryPool)(
case VK_QUERY_TYPE_PERFORMANCE_QUERY_KHR: { case VK_QUERY_TYPE_PERFORMANCE_QUERY_KHR: {
const struct intel_perf_query_field_layout *layout = const struct intel_perf_query_field_layout *layout =
&pdevice->perf->query_layout; &pdevice->perf->query_layout;
const struct anv_queue_family *queue_family;
perf_query_info = vk_find_struct_const(pCreateInfo->pNext, perf_query_info = vk_find_struct_const(pCreateInfo->pNext,
QUERY_POOL_PERFORMANCE_CREATE_INFO_KHR); QUERY_POOL_PERFORMANCE_CREATE_INFO_KHR);
/* Same restriction as in EnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR() */
queue_family = &pdevice->queue.families[perf_query_info->queueFamilyIndex];
if (!queue_family->supports_perf)
return vk_error(device, VK_ERROR_UNKNOWN);
n_passes = intel_perf_get_n_passes(pdevice->perf, n_passes = intel_perf_get_n_passes(pdevice->perf,
perf_query_info->pCounterIndices, perf_query_info->pCounterIndices,
perf_query_info->counterIndexCount, perf_query_info->counterIndexCount,