From: Cody Northrop Date: Mon, 3 Aug 2015 23:04:53 +0000 (-0600) Subject: v140: Bug 14251 - Inconsistencies in the definition of queries X-Git-Tag: upstream/1.1.92~5076 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4d3c11d455499e57557264e41048a922172516d7;p=platform%2Fupstream%2FVulkan-Tools.git v140: Bug 14251 - Inconsistencies in the definition of queries --- diff --git a/demos/cube.c b/demos/cube.c index 5ec9683..a848bcc 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -316,7 +316,7 @@ struct demo { VkQueue queue; uint32_t graphics_queue_node_index; VkPhysicalDeviceProperties gpu_props; - VkPhysicalDeviceQueueProperties *queue_props; + VkQueueFamilyProperties *queue_props; VkPhysicalDeviceMemoryProperties memory_properties; VkFramebuffer framebuffer; @@ -2407,12 +2407,13 @@ static void demo_init_vk(struct demo *demo) err = vkGetPhysicalDeviceProperties(demo->gpu, &demo->gpu_props); assert(!err); - err = vkGetPhysicalDeviceQueueCount(demo->gpu, &demo->queue_count); + /* Call with NULL data to get count */ + err = vkGetPhysicalDeviceQueueFamilyProperties(demo->gpu, &demo->queue_count, NULL); assert(!err); assert(demo->queue_count >= 1); - demo->queue_props = (VkPhysicalDeviceQueueProperties *) malloc(demo->queue_count * sizeof(VkPhysicalDeviceQueueProperties)); - err = vkGetPhysicalDeviceQueueProperties(demo->gpu, demo->queue_count, demo->queue_props); + demo->queue_props = (VkQueueFamilyProperties *) malloc(demo->queue_count * sizeof(VkQueueFamilyProperties)); + err = vkGetPhysicalDeviceQueueFamilyProperties(demo->gpu, &demo->queue_count, demo->queue_props); assert(!err); assert(demo->queue_count >= 1); } diff --git a/demos/tri.c b/demos/tri.c index 397febf..6c094ff 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -166,7 +166,7 @@ struct demo { VkDevice device; VkQueue queue; VkPhysicalDeviceProperties gpu_props; - VkPhysicalDeviceQueueProperties *queue_props; + VkQueueFamilyProperties *queue_props; uint32_t graphics_queue_node_index; int width, height; @@ -1882,11 +1882,12 @@ static void demo_init_vk(struct demo *demo) err = vkGetPhysicalDeviceProperties(demo->gpu, &demo->gpu_props); - err = vkGetPhysicalDeviceQueueCount(demo->gpu, &demo->queue_count); + // Query with NULL data to get count + err = vkGetPhysicalDeviceQueueFamilyProperties(demo->gpu, &demo->queue_count, NULL); assert(!err); - demo->queue_props = (VkPhysicalDeviceQueueProperties *) malloc(demo->queue_count * sizeof(VkPhysicalDeviceQueueProperties)); - err = vkGetPhysicalDeviceQueueProperties(demo->gpu, demo->queue_count, demo->queue_props); + demo->queue_props = (VkQueueFamilyProperties *) malloc(demo->queue_count * sizeof(VkQueueFamilyProperties)); + err = vkGetPhysicalDeviceQueueFamilyProperties(demo->gpu, &demo->queue_count, demo->queue_props); assert(!err); assert(demo->queue_count >= 1); diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c index b6a66fa..b42938d 100644 --- a/demos/vulkaninfo.c +++ b/demos/vulkaninfo.c @@ -110,7 +110,7 @@ struct app_gpu { VkPhysicalDeviceProperties props; uint32_t queue_count; - VkPhysicalDeviceQueueProperties *queue_props; + VkQueueFamilyProperties *queue_props; VkDeviceQueueCreateInfo *queue_reqs; VkPhysicalDeviceMemoryProperties memory_props; @@ -673,7 +673,7 @@ static void app_gpu_init(struct app_gpu *gpu, uint32_t id, VkPhysicalDevice obj) ERR_EXIT(err); /* get queue count */ - err = vkGetPhysicalDeviceQueueCount(gpu->obj, &gpu->queue_count); + err = vkGetPhysicalDeviceQueueFamilyProperties(gpu->obj, &gpu->queue_count, NULL); if (err) ERR_EXIT(err); @@ -682,7 +682,7 @@ static void app_gpu_init(struct app_gpu *gpu, uint32_t id, VkPhysicalDevice obj) if (!gpu->queue_props) ERR_EXIT(VK_ERROR_OUT_OF_HOST_MEMORY); - err = vkGetPhysicalDeviceQueueProperties(gpu->obj, gpu->queue_count, gpu->queue_props); + err = vkGetPhysicalDeviceQueueFamilyProperties(gpu->obj, &gpu->queue_count, gpu->queue_props); if (err) ERR_EXIT(err); @@ -844,9 +844,9 @@ static void app_dump_extensions( static void app_gpu_dump_queue_props(const struct app_gpu *gpu, uint32_t id) { - const VkPhysicalDeviceQueueProperties *props = &gpu->queue_props[id]; + const VkQueueFamilyProperties *props = &gpu->queue_props[id]; - printf("VkPhysicalDeviceQueueProperties[%d]\n", id); + printf("VkQueueFamilyProperties[%d]\n", id); printf("\tqueueFlags = %c%c%c%c\n", (props->queueFlags & VK_QUEUE_GRAPHICS_BIT) ? 'G' : '.', (props->queueFlags & VK_QUEUE_COMPUTE_BIT) ? 'C' : '.', diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index 9111dcd..68d2b93 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -1488,19 +1488,15 @@ ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceLimits( return ret; } -ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueCount( +ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueFamilyProperties( VkPhysicalDevice gpu_, - uint32_t* pCount) -{ - *pCount = 1; - return VK_SUCCESS; -} - -ICD_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueProperties( - VkPhysicalDevice gpu_, - uint32_t count, - VkPhysicalDeviceQueueProperties* pProperties) + uint32_t* pCount, + VkQueueFamilyProperties* pProperties) { + if (pProperties == NULL) { + *pCount = 1; + return VK_SUCCESS; + } pProperties->queueFlags = VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_SPARSE_MEMMGR_BIT; pProperties->queueCount = 1; pProperties->supportsTimestamps = false; diff --git a/include/vk_layer.h b/include/vk_layer.h index 30cc07f..fc61476 100644 --- a/include/vk_layer.h +++ b/include/vk_layer.h @@ -185,8 +185,7 @@ typedef struct VkLayerInstanceDispatchTable_ PFN_vkGetPhysicalDeviceLimits GetPhysicalDeviceLimits; PFN_vkGetPhysicalDeviceSparseImageFormatProperties GetPhysicalDeviceSparseImageFormatProperties; PFN_vkGetPhysicalDeviceProperties GetPhysicalDeviceProperties; - PFN_vkGetPhysicalDeviceQueueCount GetPhysicalDeviceQueueCount; - PFN_vkGetPhysicalDeviceQueueProperties GetPhysicalDeviceQueueProperties; + PFN_vkGetPhysicalDeviceQueueFamilyProperties GetPhysicalDeviceQueueFamilyProperties; PFN_vkGetPhysicalDeviceMemoryProperties GetPhysicalDeviceMemoryProperties; PFN_vkGetPhysicalDeviceExtensionProperties GetPhysicalDeviceExtensionProperties; PFN_vkGetPhysicalDeviceLayerProperties GetPhysicalDeviceLayerProperties; diff --git a/include/vulkan.h b/include/vulkan.h index 9c5e1f7..36d8b2c 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -41,7 +41,7 @@ extern "C" { ((major << 22) | (minor << 12) | patch) // Vulkan API version supported by this file -#define VK_API_VERSION VK_MAKE_VERSION(0, 139, 0) +#define VK_API_VERSION VK_MAKE_VERSION(0, 140, 0) #define VK_DEFINE_HANDLE(obj) typedef struct obj##_T* obj; @@ -1308,7 +1308,7 @@ typedef struct { VkQueueFlags queueFlags; uint32_t queueCount; VkBool32 supportsTimestamps; -} VkPhysicalDeviceQueueProperties; +} VkQueueFamilyProperties; typedef struct { VkMemoryPropertyFlags propertyFlags; @@ -2087,8 +2087,7 @@ typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceFormatProperties)(VkPhysicalDevi typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceImageFormatProperties)(VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, VkImageFormatProperties* pImageFormatProperties); typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceLimits)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceLimits* pLimits); typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceProperties)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties* pProperties); -typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceQueueCount)(VkPhysicalDevice physicalDevice, uint32_t* pCount); -typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceQueueProperties)(VkPhysicalDevice physicalDevice, uint32_t count, VkPhysicalDeviceQueueProperties* pQueueProperties); +typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceQueueFamilyProperties)(VkPhysicalDevice physicalDevice, uint32_t* pCount, VkQueueFamilyProperties* pQueueFamilyProperties); typedef VkResult (VKAPI *PFN_vkGetPhysicalDeviceMemoryProperties)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties* pMemoryProperties); typedef PFN_vkVoidFunction (VKAPI *PFN_vkGetInstanceProcAddr)(VkInstance instance, const char* pName); typedef PFN_vkVoidFunction (VKAPI *PFN_vkGetDeviceProcAddr)(VkDevice device, const char* pName); @@ -2270,14 +2269,10 @@ VkResult VKAPI vkGetPhysicalDeviceProperties( VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties* pProperties); -VkResult VKAPI vkGetPhysicalDeviceQueueCount( +VkResult VKAPI vkGetPhysicalDeviceQueueFamilyProperties( VkPhysicalDevice physicalDevice, - uint32_t* pCount); - -VkResult VKAPI vkGetPhysicalDeviceQueueProperties( - VkPhysicalDevice physicalDevice, - uint32_t count, - VkPhysicalDeviceQueueProperties* pQueueProperties); + uint32_t* pCount, + VkQueueFamilyProperties* pQueueFamilyProperties); VkResult VKAPI vkGetPhysicalDeviceMemoryProperties( VkPhysicalDevice physicalDevice, diff --git a/layers/object_track.h b/layers/object_track.h index d9eba5a..c948e52 100644 --- a/layers/object_track.h +++ b/layers/object_track.h @@ -90,7 +90,7 @@ static loader_platform_thread_mutex objLock; static uint64_t numObjs[NUM_OBJECT_TYPES] = {0}; static uint64_t numTotalObjs = 0; -static VkPhysicalDeviceQueueProperties *queueInfo = NULL; +static VkQueueFamilyProperties *queueInfo = NULL; static uint32_t queueCount = 0; template layer_data *get_my_data_ptr( @@ -214,9 +214,9 @@ setGpuQueueInfoState( void *pData) { queueCount = count; - queueInfo = (VkPhysicalDeviceQueueProperties*)realloc((void*)queueInfo, count * sizeof(VkPhysicalDeviceQueueProperties)); + queueInfo = (VkQueueFamilyProperties*)realloc((void*)queueInfo, count * sizeof(VkQueueFamilyProperties)); if (queueInfo != NULL) { - memcpy(queueInfo, pData, count * sizeof(VkPhysicalDeviceQueueProperties)); + memcpy(queueInfo, pData, count * sizeof(VkQueueFamilyProperties)); } } @@ -459,15 +459,16 @@ explicit_CreateInstance( } VkResult -explicit_GetPhysicalDeviceQueueProperties( +explicit_GetPhysicalDeviceQueueFamilyProperties( VkPhysicalDevice gpu, - uint32_t count, - VkPhysicalDeviceQueueProperties* pProperties) + uint32_t* pCount, + VkQueueFamilyProperties* pProperties) { - VkResult result = get_dispatch_table(ObjectTracker_instance_table_map, gpu)->GetPhysicalDeviceQueueProperties(gpu, count, pProperties); + VkResult result = get_dispatch_table(ObjectTracker_instance_table_map, gpu)->GetPhysicalDeviceQueueFamilyProperties(gpu, pCount, pProperties); loader_platform_thread_lock_mutex(&objLock); - setGpuQueueInfoState(count, pProperties); + if (pProperties != NULL) + setGpuQueueInfoState(*pCount, pProperties); loader_platform_thread_unlock_mutex(&objLock); return result; } diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index 3a7c1e6..0c7b4d4 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -2340,52 +2340,24 @@ VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceProperties( return result; } -bool PostGetPhysicalDeviceQueueCount( +bool PostGetPhysicalDeviceQueueFamilyProperties( VkPhysicalDevice physicalDevice, uint32_t* pCount, + VkQueueFamilyProperties* pQueueProperties, VkResult result) { - if(pCount != nullptr) + if(pQueueProperties == nullptr && pCount != nullptr) { } - if(result < VK_SUCCESS) - { - std::string reason = "vkGetPhysicalDeviceQueueCount parameter, VkResult result, is " + EnumeratorString(result); - log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); - return false; - } - - return true; -} - -VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueCount( - VkPhysicalDevice physicalDevice, - uint32_t* pCount) -{ - VkResult result = get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceQueueCount(physicalDevice, pCount); - - PostGetPhysicalDeviceQueueCount(physicalDevice, pCount, result); - - return result; -} - -bool PostGetPhysicalDeviceQueueProperties( - VkPhysicalDevice physicalDevice, - uint32_t count, - VkPhysicalDeviceQueueProperties* pQueueProperties, - VkResult result) -{ - - if(pQueueProperties != nullptr) { } if(result < VK_SUCCESS) { - std::string reason = "vkGetPhysicalDeviceQueueProperties parameter, VkResult result, is " + EnumeratorString(result); + std::string reason = "vkGetPhysicalDeviceQueueFamilyProperties parameter, VkResult result, is " + EnumeratorString(result); log_msg(mdd(physicalDevice), VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, 1, "PARAMCHECK", reason.c_str()); return false; } @@ -2395,12 +2367,12 @@ bool PostGetPhysicalDeviceQueueProperties( VK_LAYER_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueProperties( VkPhysicalDevice physicalDevice, - uint32_t count, - VkPhysicalDeviceQueueProperties* pQueueProperties) + uint32_t* pCount, + VkQueueFamilyProperties* pQueueProperties) { - VkResult result = get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceQueueProperties(physicalDevice, count, pQueueProperties); + VkResult result = get_dispatch_table(pc_instance_table_map, physicalDevice)->GetPhysicalDeviceQueueFamilyProperties(physicalDevice, pCount, pQueueProperties); - PostGetPhysicalDeviceQueueProperties(physicalDevice, count, pQueueProperties, result); + PostGetPhysicalDeviceQueueFamilyProperties(physicalDevice, pCount, pQueueProperties, result); return result; } diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h index e462a1d..96c4f6a 100644 --- a/loader/gpa_helper.h +++ b/loader/gpa_helper.h @@ -47,10 +47,8 @@ static inline void* globalGetProcAddr(const char *name) return (void*) vkGetPhysicalDeviceLimits; if (!strcmp(name, "GetPhysicalDeviceProperties")) return (void*) vkGetPhysicalDeviceProperties; - if (!strcmp(name, "GetPhysicalDeviceQueueCount")) - return (void*) vkGetPhysicalDeviceQueueCount; - if (!strcmp(name, "GetPhysicalDeviceQueueProperties")) - return (void*) vkGetPhysicalDeviceQueueProperties; + if (!strcmp(name, "GetPhysicalDeviceQueueFamilyProperties")) + return (void*) vkGetPhysicalDeviceQueueFamilyProperties; if (!strcmp(name, "GetPhysicalDeviceMemoryProperties")) return (void*) vkGetPhysicalDeviceMemoryProperties; if (!strcmp(name, "GetInstanceProcAddr")) @@ -362,10 +360,8 @@ static inline void *loader_non_passthrough_gpa(const char *name) return (void*) vkGetPhysicalDeviceImageFormatProperties; if (!strcmp(name, "GetPhysicalDeviceLimits")) return (void*) vkGetPhysicalDeviceLimits; - if (!strcmp(name, "GetPhysicalDeviceQueueCount")) - return (void*) vkGetPhysicalDeviceQueueCount; - if (!strcmp(name, "GetPhysicalDeviceQueueProperties")) - return (void*) vkGetPhysicalDeviceQueueProperties; + if (!strcmp(name, "GetPhysicalDeviceQueueFamilyProperties")) + return (void*) vkGetPhysicalDeviceQueueFamilyProperties; if (!strcmp(name, "GetPhysicalDeviceMemoryProperties")) return (void*) vkGetPhysicalDeviceMemoryProperties; if (!strcmp(name, "GetPhysicalDeviceProperties")) diff --git a/loader/loader.c b/loader/loader.c index e2dd54a..34e4feb 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -95,8 +95,7 @@ const VkLayerInstanceDispatchTable instance_disp = { .GetPhysicalDeviceImageFormatProperties = loader_GetPhysicalDeviceImageFormatProperties, .GetPhysicalDeviceLimits = loader_GetPhysicalDeviceLimits, .GetPhysicalDeviceProperties = loader_GetPhysicalDeviceProperties, - .GetPhysicalDeviceQueueCount = loader_GetPhysicalDeviceQueueCount, - .GetPhysicalDeviceQueueProperties = loader_GetPhysicalDeviceQueueProperties, + .GetPhysicalDeviceQueueFamilyProperties = loader_GetPhysicalDeviceQueueFamilyProperties, .GetPhysicalDeviceMemoryProperties = loader_GetPhysicalDeviceMemoryProperties, .GetPhysicalDeviceExtensionProperties = loader_GetPhysicalDeviceExtensionProperties, .GetPhysicalDeviceLayerProperties = loader_GetPhysicalDeviceLayerProperties, @@ -1046,8 +1045,7 @@ static bool loader_icd_init_entrys(struct loader_icd *icd, LOOKUP_GIPA(CreateDevice, true); LOOKUP_GIPA(GetPhysicalDeviceProperties, true); LOOKUP_GIPA(GetPhysicalDeviceMemoryProperties, true); - LOOKUP_GIPA(GetPhysicalDeviceQueueCount, true); - LOOKUP_GIPA(GetPhysicalDeviceQueueProperties, true); + LOOKUP_GIPA(GetPhysicalDeviceQueueFamilyProperties, true); LOOKUP_GIPA(GetPhysicalDeviceExtensionProperties, true); LOOKUP_GIPA(GetPhysicalDeviceSparseImageFormatProperties, true); LOOKUP_GIPA(DbgCreateMsgCallback, false); @@ -2577,31 +2575,17 @@ VkResult VKAPI loader_GetPhysicalDeviceProperties( return res; } -VkResult VKAPI loader_GetPhysicalDeviceQueueCount( +VkResult VKAPI loader_GetPhysicalDeviceQueueFamilyProperties ( VkPhysicalDevice gpu, - uint32_t* pCount) -{ - uint32_t gpu_index; - struct loader_icd *icd = loader_get_icd(gpu, &gpu_index); - VkResult res = VK_ERROR_INITIALIZATION_FAILED; - - if (icd->GetPhysicalDeviceQueueCount) - res = icd->GetPhysicalDeviceQueueCount(gpu, pCount); - - return res; -} - -VkResult VKAPI loader_GetPhysicalDeviceQueueProperties ( - VkPhysicalDevice gpu, - uint32_t count, - VkPhysicalDeviceQueueProperties * pProperties) + uint32_t* pCount, + VkQueueFamilyProperties* pProperties) { uint32_t gpu_index; struct loader_icd *icd = loader_get_icd(gpu, &gpu_index); VkResult res = VK_ERROR_INITIALIZATION_FAILED; - if (icd->GetPhysicalDeviceQueueProperties) - res = icd->GetPhysicalDeviceQueueProperties(gpu, count, pProperties); + if (icd->GetPhysicalDeviceQueueFamilyProperties) + res = icd->GetPhysicalDeviceQueueFamilyProperties(gpu, pCount, pProperties); return res; } diff --git a/loader/loader.h b/loader/loader.h index 21e997d..6b2a3d7 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -136,8 +136,7 @@ struct loader_icd { PFN_vkGetPhysicalDeviceLimits GetPhysicalDeviceLimits; PFN_vkCreateDevice CreateDevice; PFN_vkGetPhysicalDeviceProperties GetPhysicalDeviceProperties; - PFN_vkGetPhysicalDeviceQueueCount GetPhysicalDeviceQueueCount; - PFN_vkGetPhysicalDeviceQueueProperties GetPhysicalDeviceQueueProperties; + PFN_vkGetPhysicalDeviceQueueFamilyProperties GetPhysicalDeviceQueueFamilyProperties; PFN_vkGetPhysicalDeviceMemoryProperties GetPhysicalDeviceMemoryProperties; PFN_vkGetPhysicalDeviceExtensionProperties GetPhysicalDeviceExtensionProperties; PFN_vkGetPhysicalDeviceSparseImageFormatProperties GetPhysicalDeviceSparseImageFormatProperties; @@ -321,14 +320,10 @@ VkResult VKAPI loader_GetPhysicalDeviceLayerProperties (VkPhysicalDevice physica uint32_t *pCount, VkLayerProperties* pProperties); -VkResult VKAPI loader_GetPhysicalDeviceQueueCount ( - VkPhysicalDevice physicalDevice, - uint32_t* pCount); - -VkResult VKAPI loader_GetPhysicalDeviceQueueProperties ( - VkPhysicalDevice physicalDevice, - uint32_t count, - VkPhysicalDeviceQueueProperties * pProperties); +VkResult VKAPI loader_GetPhysicalDeviceQueueFamilyProperties ( + VkPhysicalDevice physicalDevice, + uint32_t* pCount, + VkQueueFamilyProperties* pProperties); VkResult VKAPI loader_GetPhysicalDeviceMemoryProperties ( VkPhysicalDevice physicalDevice, diff --git a/loader/table_ops.h b/loader/table_ops.h index c33e1cb..c6be289 100644 --- a/loader/table_ops.h +++ b/loader/table_ops.h @@ -482,8 +482,7 @@ static inline void loader_init_instance_core_dispatch_table(VkLayerInstanceDispa table->GetPhysicalDeviceLimits = (PFN_vkGetPhysicalDeviceLimits) gpa(inst, "vkGetPhysicalDeviceLimits"); table->GetPhysicalDeviceSparseImageFormatProperties = (PFN_vkGetPhysicalDeviceSparseImageFormatProperties) gpa(inst, "vkGetPhysicalDeviceSparseImageFormatProperties"); table->GetPhysicalDeviceProperties = (PFN_vkGetPhysicalDeviceProperties) gpa(inst, "vkGetPhysicalDeviceProperties"); - table->GetPhysicalDeviceQueueCount = (PFN_vkGetPhysicalDeviceQueueCount) gpa(inst, "vkGetPhysicalDeviceQueueCount"); - table->GetPhysicalDeviceQueueProperties = (PFN_vkGetPhysicalDeviceQueueProperties) gpa(inst, "vkGetPhysicalDeviceQueueProperties"); + table->GetPhysicalDeviceQueueFamilyProperties = (PFN_vkGetPhysicalDeviceQueueFamilyProperties) gpa(inst, "vkGetPhysicalDeviceQueueFamilyProperties"); table->GetPhysicalDeviceMemoryProperties = (PFN_vkGetPhysicalDeviceMemoryProperties) gpa(inst, "vkGetPhysicalDeviceMemoryProperties"); table->GetPhysicalDeviceExtensionProperties = (PFN_vkGetPhysicalDeviceExtensionProperties) gpa(inst, "vkGetPhysicalDeviceExtensionProperties"); table->GetPhysicalDeviceLayerProperties = (PFN_vkGetPhysicalDeviceLayerProperties) gpa(inst, "vkGetPhysicalDeviceLayerProperties"); @@ -524,10 +523,8 @@ static inline void *loader_lookup_instance_dispatch_table( return (void *) table->GetPhysicalDeviceSparseImageFormatProperties; if (!strcmp(name, "GetPhysicalDeviceProperties")) return (void *) table->GetPhysicalDeviceProperties; - if (!strcmp(name, "GetPhysicalDeviceQueueCount")) - return (void *) table->GetPhysicalDeviceQueueCount; - if (!strcmp(name, "GetPhysicalDeviceQueueProperties")) - return (void *) table->GetPhysicalDeviceQueueProperties; + if (!strcmp(name, "GetPhysicalDeviceQueueFamilyProperties")) + return (void *) table->GetPhysicalDeviceQueueFamilyProperties; if (!strcmp(name, "GetPhysicalDeviceMemoryProperties")) return (void *) table->GetPhysicalDeviceMemoryProperties; if (!strcmp(name, "GetInstanceProcAddr")) diff --git a/loader/trampoline.c b/loader/trampoline.c index 2a236e4..e978868 100644 --- a/loader/trampoline.c +++ b/loader/trampoline.c @@ -236,28 +236,16 @@ LOADER_EXPORT VkResult VKAPI vkGetPhysicalDeviceProperties( return res; } -LOADER_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueCount( +LOADER_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueFamilyProperties( VkPhysicalDevice gpu, - uint32_t* pCount) -{ - const VkLayerInstanceDispatchTable *disp; - VkResult res; - - disp = loader_get_instance_dispatch(gpu); - res = disp->GetPhysicalDeviceQueueCount(gpu, pCount); - return res; -} - -LOADER_EXPORT VkResult VKAPI vkGetPhysicalDeviceQueueProperties( - VkPhysicalDevice gpu, - uint32_t count, - VkPhysicalDeviceQueueProperties* pQueueProperties) + uint32_t* pCount, + VkQueueFamilyProperties* pQueueProperties) { const VkLayerInstanceDispatchTable *disp; VkResult res; disp = loader_get_instance_dispatch(gpu); - res = disp->GetPhysicalDeviceQueueProperties(gpu, count, pQueueProperties); + res = disp->GetPhysicalDeviceQueueFamilyProperties(gpu, pCount, pQueueProperties); return res; } diff --git a/vk-layer-generate.py b/vk-layer-generate.py index 042da7c..93377ee 100755 --- a/vk-layer-generate.py +++ b/vk-layer-generate.py @@ -1398,7 +1398,7 @@ class ObjectTrackerSubcommand(Subcommand): explicit_object_tracker_functions = [ "CreateInstance", - "GetPhysicalDeviceQueueProperties", + "GetPhysicalDeviceQueueFamilyProperties", "CreateDevice", "GetDeviceQueue", "QueueSubmit", diff --git a/vulkan.py b/vulkan.py index ef1b66b..3d73175 100755 --- a/vulkan.py +++ b/vulkan.py @@ -269,14 +269,10 @@ core = Extension( [Param("VkPhysicalDevice", "physicalDevice"), Param("VkPhysicalDeviceProperties*", "pProperties")]), - Proto("VkResult", "GetPhysicalDeviceQueueCount", + Proto("VkResult", "GetPhysicalDeviceQueueFamilyProperties", [Param("VkPhysicalDevice", "physicalDevice"), - Param("uint32_t*", "pCount")]), - - Proto("VkResult", "GetPhysicalDeviceQueueProperties", - [Param("VkPhysicalDevice", "physicalDevice"), - Param("uint32_t", "count"), - Param("VkPhysicalDeviceQueueProperties*", "pQueueProperties")]), + Param("uint32_t*", "pCount"), + Param("VkQueueFamilyProperties*", "pQueueFamilyProperties")]), Proto("VkResult", "GetPhysicalDeviceMemoryProperties", [Param("VkPhysicalDevice", "physicalDevice"),