Module: Mesa Branch: main Commit: 32f0034ec9b0b2a41dbdf6f5d14482852d06de6d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=32f0034ec9b0b2a41dbdf6f5d14482852d06de6d
Author: Jesse Natalie <jenat...@microsoft.com> Date: Tue Apr 18 14:40:49 2023 -0700 vulkan: Remove no-longer-needed prototypes for ICD entrypoints The comment around these is no longer true, vk_icd.h does in fact have prototypes for these functions. Reviewed-by: Faith Ekstrand <faith.ekstr...@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25998> --- docs/vulkan/base-objs.rst | 13 ------------- src/broadcom/vulkan/v3dv_device.c | 16 ---------------- src/freedreno/vulkan/tu_device.cc | 15 --------------- src/gallium/frontends/lavapipe/lvp_device.c | 16 ---------------- src/intel/vulkan/anv_device.c | 16 ---------------- src/intel/vulkan_hasvk/anv_device.c | 16 ---------------- src/microsoft/vulkan/dzn_device.c | 17 ----------------- src/nouveau/vulkan/nvk_instance.c | 6 ------ src/panfrost/vulkan/panvk_device.c | 14 -------------- 9 files changed, 129 deletions(-) diff --git a/docs/vulkan/base-objs.rst b/docs/vulkan/base-objs.rst index 4c2a70c7708..cb923fb0d88 100644 --- a/docs/vulkan/base-objs.rst +++ b/docs/vulkan/base-objs.rst @@ -118,10 +118,6 @@ instance-level ``vkGet*ProcAddr()`` entrypoints is trivial: pName); } - PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL - vk_icdGetInstanceProcAddr(VkInstance instance, - const char *pName); - PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr(VkInstance instance, const char *pName) @@ -129,10 +125,6 @@ instance-level ``vkGet*ProcAddr()`` entrypoints is trivial: return drv_GetInstanceProcAddr(instance, pName); } - PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL - vk_icdGetPhysicalDeviceProcAddr(VkInstance _instance, - const char* pName); - PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetPhysicalDeviceProcAddr(VkInstance _instance, const char* pName) @@ -141,11 +133,6 @@ instance-level ``vkGet*ProcAddr()`` entrypoints is trivial: return vk_instance_get_physical_device_proc_addr(instance, pName); } -The prototypes for the ``vk_icd*`` versions are needed because those are not -actually defined in the Vulkan headers and you need the prototype somewhere -to get the C compiler to not complain. These are all implemented by -wrapping one of the provided ``vk_instance_get*_proc_addr()`` functions. - .. c:autofunction:: vk_instance_get_proc_addr .. c:autofunction:: vk_instance_get_proc_addr_unchecked diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c index 60c55120fe6..a7d88ba73c4 100644 --- a/src/broadcom/vulkan/v3dv_device.c +++ b/src/broadcom/vulkan/v3dv_device.c @@ -1826,11 +1826,6 @@ v3dv_GetInstanceProcAddr(VkInstance _instance, * vk_icdGetInstanceProcAddr to work around certain LD_PRELOAD issues seen in apps. */ PUBLIC -VKAPI_ATTR PFN_vkVoidFunction -VKAPI_CALL vk_icdGetInstanceProcAddr(VkInstance instance, - const char *pName); - -PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr(VkInstance instance, const char* pName) @@ -1841,11 +1836,6 @@ vk_icdGetInstanceProcAddr(VkInstance instance, /* With version 4+ of the loader interface the ICD should expose * vk_icdGetPhysicalDeviceProcAddr() */ -PUBLIC -VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL -vk_icdGetPhysicalDeviceProcAddr(VkInstance _instance, - const char* pName); - PFN_vkVoidFunction vk_icdGetPhysicalDeviceProcAddr(VkInstance _instance, const char* pName) @@ -3099,12 +3089,6 @@ v3dv_GetDeviceImageSparseMemoryRequirementsKHR( *pSparseMemoryRequirementCount = 0; } -/* vk_icd.h does not declare this function, so we declare it here to - * suppress Wmissing-prototypes. - */ -PUBLIC VKAPI_ATTR VkResult VKAPI_CALL -vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion); - PUBLIC VKAPI_ATTR VkResult VKAPI_CALL vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion) { diff --git a/src/freedreno/vulkan/tu_device.cc b/src/freedreno/vulkan/tu_device.cc index b638f9c5890..03bc39edd76 100644 --- a/src/freedreno/vulkan/tu_device.cc +++ b/src/freedreno/vulkan/tu_device.cc @@ -2568,10 +2568,6 @@ tu_GetInstanceProcAddr(VkInstance _instance, const char *pName) /* The loader wants us to expose a second GetInstanceProcAddr function * to work around certain LD_PRELOAD issues seen in apps. */ -PUBLIC -VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL -vk_icdGetInstanceProcAddr(VkInstance instance, const char *pName); - PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr(VkInstance instance, const char *pName) @@ -2582,11 +2578,6 @@ vk_icdGetInstanceProcAddr(VkInstance instance, const char *pName) /* With version 4+ of the loader interface the ICD should expose * vk_icdGetPhysicalDeviceProcAddr() */ -PUBLIC -VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL -vk_icdGetPhysicalDeviceProcAddr(VkInstance _instance, - const char* pName); - PFN_vkVoidFunction vk_icdGetPhysicalDeviceProcAddr(VkInstance _instance, const char* pName) @@ -3216,12 +3207,6 @@ tu_DestroySampler(VkDevice _device, vk_object_free(&device->vk, pAllocator, sampler); } -/* vk_icd.h does not declare this function, so we declare it here to - * suppress Wmissing-prototypes. - */ -PUBLIC VKAPI_ATTR VkResult VKAPI_CALL -vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *pSupportedVersion); - PUBLIC VKAPI_ATTR VkResult VKAPI_CALL vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *pSupportedVersion) { diff --git a/src/gallium/frontends/lavapipe/lvp_device.c b/src/gallium/frontends/lavapipe/lvp_device.c index 978cc16cc43..82a804c6e5f 100644 --- a/src/gallium/frontends/lavapipe/lvp_device.c +++ b/src/gallium/frontends/lavapipe/lvp_device.c @@ -1369,11 +1369,6 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL lvp_GetInstanceProcAddr( * to work around certain LD_PRELOAD issues seen in apps. */ PUBLIC -VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr( - VkInstance instance, - const char* pName); - -PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr( VkInstance instance, const char* pName) @@ -1381,11 +1376,6 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr( return lvp_GetInstanceProcAddr(instance, pName); } -PUBLIC -VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetPhysicalDeviceProcAddr( - VkInstance _instance, - const char* pName); - PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetPhysicalDeviceProcAddr( VkInstance _instance, @@ -2296,12 +2286,6 @@ VKAPI_ATTR void VKAPI_CALL lvp_DestroySampler( vk_sampler_destroy(&device->vk, pAllocator, &sampler->vk); } -/* vk_icd.h does not declare this function, so we declare it here to - * suppress Wmissing-prototypes. - */ -PUBLIC VKAPI_ATTR VkResult VKAPI_CALL -vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion); - PUBLIC VKAPI_ATTR VkResult VKAPI_CALL vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion) { diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index ca710fd6957..ab3f760f42e 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -2833,11 +2833,6 @@ PFN_vkVoidFunction anv_GetInstanceProcAddr( * vk_icdGetInstanceProcAddr to work around certain LD_PRELOAD issues seen in apps. */ PUBLIC -VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr( - VkInstance instance, - const char* pName); - -PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr( VkInstance instance, const char* pName) @@ -2848,11 +2843,6 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr( /* With version 4+ of the loader interface the ICD should expose * vk_icdGetPhysicalDeviceProcAddr() */ -PUBLIC -VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetPhysicalDeviceProcAddr( - VkInstance _instance, - const char* pName); - PFN_vkVoidFunction vk_icdGetPhysicalDeviceProcAddr( VkInstance _instance, const char* pName) @@ -4887,12 +4877,6 @@ void anv_GetPhysicalDeviceMultisamplePropertiesEXT( anv_debug_ignored_stype(ext->sType); } -/* vk_icd.h does not declare this function, so we declare it here to - * suppress Wmissing-prototypes. - */ -PUBLIC VKAPI_ATTR VkResult VKAPI_CALL -vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion); - PUBLIC VKAPI_ATTR VkResult VKAPI_CALL vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion) { diff --git a/src/intel/vulkan_hasvk/anv_device.c b/src/intel/vulkan_hasvk/anv_device.c index caa57a7f106..9d523423e78 100644 --- a/src/intel/vulkan_hasvk/anv_device.c +++ b/src/intel/vulkan_hasvk/anv_device.c @@ -2243,11 +2243,6 @@ PFN_vkVoidFunction anv_GetInstanceProcAddr( * vk_icdGetInstanceProcAddr to work around certain LD_PRELOAD issues seen in apps. */ PUBLIC -VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr( - VkInstance instance, - const char* pName); - -PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr( VkInstance instance, const char* pName) @@ -2258,11 +2253,6 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr( /* With version 4+ of the loader interface the ICD should expose * vk_icdGetPhysicalDeviceProcAddr() */ -PUBLIC -VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetPhysicalDeviceProcAddr( - VkInstance _instance, - const char* pName); - PFN_vkVoidFunction vk_icdGetPhysicalDeviceProcAddr( VkInstance _instance, const char* pName) @@ -4028,12 +4018,6 @@ void anv_GetPhysicalDeviceMultisamplePropertiesEXT( anv_debug_ignored_stype(ext->sType); } -/* vk_icd.h does not declare this function, so we declare it here to - * suppress Wmissing-prototypes. - */ -PUBLIC VKAPI_ATTR VkResult VKAPI_CALL -vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion); - PUBLIC VKAPI_ATTR VkResult VKAPI_CALL vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion) { diff --git a/src/microsoft/vulkan/dzn_device.c b/src/microsoft/vulkan/dzn_device.c index 9cdcd9594b7..8d36276bcfb 100644 --- a/src/microsoft/vulkan/dzn_device.c +++ b/src/microsoft/vulkan/dzn_device.c @@ -1857,13 +1857,6 @@ dzn_GetInstanceProcAddr(VkInstance _instance, #define PUBLIC #endif -/* With version 1+ of the loader interface the ICD should expose - * vk_icdGetInstanceProcAddr to work around certain LD_PRELOAD issues seen in apps. - */ -PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL -vk_icdGetInstanceProcAddr(VkInstance instance, - const char *pName); - PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr(VkInstance instance, const char *pName) @@ -1874,10 +1867,6 @@ vk_icdGetInstanceProcAddr(VkInstance instance, /* With version 4+ of the loader interface the ICD should expose * vk_icdGetPhysicalDeviceProcAddr() */ -PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL -vk_icdGetPhysicalDeviceProcAddr(VkInstance _instance, - const char *pName); - VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetPhysicalDeviceProcAddr(VkInstance _instance, const char *pName) @@ -1886,12 +1875,6 @@ vk_icdGetPhysicalDeviceProcAddr(VkInstance _instance, return vk_instance_get_physical_device_proc_addr(&instance->vk, pName); } -/* vk_icd.h does not declare this function, so we declare it here to - * suppress Wmissing-prototypes. - */ -PUBLIC VKAPI_ATTR VkResult VKAPI_CALL -vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *pSupportedVersion); - PUBLIC VKAPI_ATTR VkResult VKAPI_CALL vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *pSupportedVersion) { diff --git a/src/nouveau/vulkan/nvk_instance.c b/src/nouveau/vulkan/nvk_instance.c index e37b648662f..3f37d0abbf8 100644 --- a/src/nouveau/vulkan/nvk_instance.c +++ b/src/nouveau/vulkan/nvk_instance.c @@ -19,12 +19,6 @@ nvk_EnumerateInstanceVersion(uint32_t *pApiVersion) return VK_SUCCESS; } -/* vk_icd.h does not declare this function, so we declare it here to - * suppress Wmissing-prototypes. - */ -PUBLIC VKAPI_ATTR VkResult VKAPI_CALL -vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion); - PUBLIC VKAPI_ATTR VkResult VKAPI_CALL vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t* pSupportedVersion) { diff --git a/src/panfrost/vulkan/panvk_device.c b/src/panfrost/vulkan/panvk_device.c index f242e79facd..c4fd6dab4af 100644 --- a/src/panfrost/vulkan/panvk_device.c +++ b/src/panfrost/vulkan/panvk_device.c @@ -1012,10 +1012,6 @@ panvk_GetInstanceProcAddr(VkInstance _instance, const char *pName) /* The loader wants us to expose a second GetInstanceProcAddr function * to work around certain LD_PRELOAD issues seen in apps. */ -PUBLIC -VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL -vk_icdGetInstanceProcAddr(VkInstance instance, const char *pName); - PUBLIC VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vk_icdGetInstanceProcAddr(VkInstance instance, const char *pName) @@ -1026,10 +1022,6 @@ vk_icdGetInstanceProcAddr(VkInstance instance, const char *pName) /* With version 4+ of the loader interface the ICD should expose * vk_icdGetPhysicalDeviceProcAddr() */ -PUBLIC -VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL -vk_icdGetPhysicalDeviceProcAddr(VkInstance _instance, const char *pName); - PFN_vkVoidFunction vk_icdGetPhysicalDeviceProcAddr(VkInstance _instance, const char *pName) { @@ -1450,12 +1442,6 @@ panvk_DestroySampler(VkDevice _device, VkSampler _sampler, vk_object_free(&device->vk, pAllocator, sampler); } -/* vk_icd.h does not declare this function, so we declare it here to - * suppress Wmissing-prototypes. - */ -PUBLIC VKAPI_ATTR VkResult VKAPI_CALL -vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *pSupportedVersion); - PUBLIC VKAPI_ATTR VkResult VKAPI_CALL vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *pSupportedVersion) {
