Merge branch 'vn-attri-fix' into 'main'

venus: amend missing VKAPI_ATTR/CALL for render pass APIs

See merge request mesa/mesa!39033
This commit is contained in:
Yiwei Zhang 2025-12-19 17:47:44 -08:00
commit 435c347ec3

View file

@ -194,7 +194,7 @@ vn_render_pass_create(struct vn_device *dev,
/* render pass commands */ /* render pass commands */
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateRenderPass(VkDevice device, vn_CreateRenderPass(VkDevice device,
const VkRenderPassCreateInfo *pCreateInfo, const VkRenderPassCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -249,7 +249,7 @@ vn_CreateRenderPass(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateRenderPass2(VkDevice device, vn_CreateRenderPass2(VkDevice device,
const VkRenderPassCreateInfo2 *pCreateInfo, const VkRenderPassCreateInfo2 *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -299,7 +299,7 @@ vn_CreateRenderPass2(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyRenderPass(VkDevice device, vn_DestroyRenderPass(VkDevice device,
VkRenderPass renderPass, VkRenderPass renderPass,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -318,7 +318,7 @@ vn_DestroyRenderPass(VkDevice device,
vk_free(alloc, pass); vk_free(alloc, pass);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetRenderAreaGranularity(VkDevice device, vn_GetRenderAreaGranularity(VkDevice device,
VkRenderPass renderPass, VkRenderPass renderPass,
VkExtent2D *pGranularity) VkExtent2D *pGranularity)
@ -334,7 +334,7 @@ vn_GetRenderAreaGranularity(VkDevice device,
*pGranularity = pass->granularity; *pGranularity = pass->granularity;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetRenderingAreaGranularity(VkDevice device, vn_GetRenderingAreaGranularity(VkDevice device,
const VkRenderingAreaInfo *pRenderingAreaInfo, const VkRenderingAreaInfo *pRenderingAreaInfo,
VkExtent2D *pGranularity) VkExtent2D *pGranularity)
@ -348,7 +348,7 @@ vn_GetRenderingAreaGranularity(VkDevice device,
/* framebuffer commands */ /* framebuffer commands */
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateFramebuffer(VkDevice device, vn_CreateFramebuffer(VkDevice device,
const VkFramebufferCreateInfo *pCreateInfo, const VkFramebufferCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -386,7 +386,7 @@ vn_CreateFramebuffer(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyFramebuffer(VkDevice device, vn_DestroyFramebuffer(VkDevice device,
VkFramebuffer framebuffer, VkFramebuffer framebuffer,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)