fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 07:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

venus: add missing VKAPI_ATTR/CALL
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/14446
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38882>
This commit is contained in:
Yiwei Zhang 2025-12-09 22:13:46 -08:00 • committed by Marge Bot
parent b17896f693
commit c696ec3b73
15 changed files with 286 additions and 286 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/virtio/vulkan/vn_acceleration_structure.c
View file

@ -9,7 +9,7 @@
#include "vn_device.h" #include "vn_device.h"
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateAccelerationStructureKHR( vn_CreateAccelerationStructureKHR(
VkDevice device, VkDevice device,
const VkAccelerationStructureCreateInfoKHR *pCreateInfo, const VkAccelerationStructureCreateInfoKHR *pCreateInfo,
@ -39,7 +39,7 @@ vn_CreateAccelerationStructureKHR(
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyAccelerationStructureKHR( vn_DestroyAccelerationStructureKHR(
VkDevice device, VkDevice device,
VkAccelerationStructureKHR accelerationStructure, VkAccelerationStructureKHR accelerationStructure,
@ -61,7 +61,7 @@ vn_DestroyAccelerationStructureKHR(
vk_free(alloc, accel); vk_free(alloc, accel);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetAccelerationStructureBuildSizesKHR( vn_GetAccelerationStructureBuildSizesKHR(
VkDevice device, VkDevice device,
VkAccelerationStructureBuildTypeKHR buildType, VkAccelerationStructureBuildTypeKHR buildType,
@ -76,7 +76,7 @@ vn_GetAccelerationStructureBuildSizesKHR(
pSizeInfo); pSizeInfo);
} }
VkDeviceAddress VKAPI_ATTR VkDeviceAddress VKAPI_CALL
vn_GetAccelerationStructureDeviceAddressKHR( vn_GetAccelerationStructureDeviceAddressKHR(
VkDevice device, const VkAccelerationStructureDeviceAddressInfoKHR *pInfo) VkDevice device, const VkAccelerationStructureDeviceAddressInfoKHR *pInfo)
{ {
@ -86,7 +86,7 @@ vn_GetAccelerationStructureDeviceAddressKHR(
dev->primary_ring, device, pInfo); dev->primary_ring, device, pInfo);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetDeviceAccelerationStructureCompatibilityKHR( vn_GetDeviceAccelerationStructureCompatibilityKHR(
VkDevice device, VkDevice device,
const VkAccelerationStructureVersionInfoKHR *pVersionInfo, const VkAccelerationStructureVersionInfoKHR *pVersionInfo,
@ -99,7 +99,7 @@ vn_GetDeviceAccelerationStructureCompatibilityKHR(
dev->primary_ring, device, pVersionInfo, pCompatibility); dev->primary_ring, device, pVersionInfo, pCompatibility);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_BuildAccelerationStructuresKHR( vn_BuildAccelerationStructuresKHR(
VkDevice device, VkDevice device,
VkDeferredOperationKHR deferredOperation, VkDeferredOperationKHR deferredOperation,
@ -112,7 +112,7 @@ vn_BuildAccelerationStructuresKHR(
return vn_error(dev->instance, VK_ERROR_FEATURE_NOT_PRESENT); return vn_error(dev->instance, VK_ERROR_FEATURE_NOT_PRESENT);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CopyAccelerationStructureKHR( vn_CopyAccelerationStructureKHR(
VkDevice device, VkDevice device,
VkDeferredOperationKHR deferredOperation, VkDeferredOperationKHR deferredOperation,
@ -123,7 +123,7 @@ vn_CopyAccelerationStructureKHR(
return vn_error(dev->instance, VK_ERROR_FEATURE_NOT_PRESENT); return vn_error(dev->instance, VK_ERROR_FEATURE_NOT_PRESENT);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CopyAccelerationStructureToMemoryKHR( vn_CopyAccelerationStructureToMemoryKHR(
VkDevice device, VkDevice device,
VkDeferredOperationKHR deferredOperation, VkDeferredOperationKHR deferredOperation,
@ -134,7 +134,7 @@ vn_CopyAccelerationStructureToMemoryKHR(
return vn_error(dev->instance, VK_ERROR_FEATURE_NOT_PRESENT); return vn_error(dev->instance, VK_ERROR_FEATURE_NOT_PRESENT);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CopyMemoryToAccelerationStructureKHR( vn_CopyMemoryToAccelerationStructureKHR(
VkDevice device, VkDevice device,
VkDeferredOperationKHR deferredOperation, VkDeferredOperationKHR deferredOperation,
@ -145,7 +145,7 @@ vn_CopyMemoryToAccelerationStructureKHR(
return vn_error(dev->instance, VK_ERROR_FEATURE_NOT_PRESENT); return vn_error(dev->instance, VK_ERROR_FEATURE_NOT_PRESENT);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_WriteAccelerationStructuresPropertiesKHR( vn_WriteAccelerationStructuresPropertiesKHR(
VkDevice device, VkDevice device,
uint32_t accelerationStructureCount, uint32_t accelerationStructureCount,

18
src/virtio/vulkan/vn_buffer.c
View file

@ -342,7 +342,7 @@ vn_buffer_fix_create_info(
return &local_info->create; return &local_info->create;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateBuffer(VkDevice device, vn_CreateBuffer(VkDevice device,
const VkBufferCreateInfo *pCreateInfo, const VkBufferCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -374,7 +374,7 @@ vn_CreateBuffer(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyBuffer(VkDevice device, vn_DestroyBuffer(VkDevice device,
VkBuffer buffer, VkBuffer buffer,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -393,7 +393,7 @@ vn_DestroyBuffer(VkDevice device,
vk_free(alloc, buf); vk_free(alloc, buf);
} }
VkDeviceAddress VKAPI_ATTR VkDeviceAddress VKAPI_CALL
vn_GetBufferDeviceAddress(VkDevice device, vn_GetBufferDeviceAddress(VkDevice device,
const VkBufferDeviceAddressInfo *pInfo) const VkBufferDeviceAddressInfo *pInfo)
{ {
@ -402,7 +402,7 @@ vn_GetBufferDeviceAddress(VkDevice device,
return vn_call_vkGetBufferDeviceAddress(dev->primary_ring, device, pInfo); return vn_call_vkGetBufferDeviceAddress(dev->primary_ring, device, pInfo);
} }
uint64_t VKAPI_ATTR uint64_t VKAPI_CALL
vn_GetBufferOpaqueCaptureAddress(VkDevice device, vn_GetBufferOpaqueCaptureAddress(VkDevice device,
const VkBufferDeviceAddressInfo *pInfo) const VkBufferDeviceAddressInfo *pInfo)
{ {
@ -412,7 +412,7 @@ vn_GetBufferOpaqueCaptureAddress(VkDevice device,
pInfo); pInfo);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetBufferMemoryRequirements2(VkDevice device, vn_GetBufferMemoryRequirements2(VkDevice device,
const VkBufferMemoryRequirementsInfo2 *pInfo, const VkBufferMemoryRequirementsInfo2 *pInfo,
VkMemoryRequirements2 *pMemoryRequirements) VkMemoryRequirements2 *pMemoryRequirements)
@ -423,7 +423,7 @@ vn_GetBufferMemoryRequirements2(VkDevice device,
pMemoryRequirements); pMemoryRequirements);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_BindBufferMemory2(VkDevice device, vn_BindBufferMemory2(VkDevice device,
uint32_t bindInfoCount, uint32_t bindInfoCount,
const VkBindBufferMemoryInfo *pBindInfos) const VkBindBufferMemoryInfo *pBindInfos)
@ -444,7 +444,7 @@ vn_BindBufferMemory2(VkDevice device,
/* buffer view commands */ /* buffer view commands */
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateBufferView(VkDevice device, vn_CreateBufferView(VkDevice device,
const VkBufferViewCreateInfo *pCreateInfo, const VkBufferViewCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -471,7 +471,7 @@ vn_CreateBufferView(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyBufferView(VkDevice device, vn_DestroyBufferView(VkDevice device,
VkBufferView bufferView, VkBufferView bufferView,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -490,7 +490,7 @@ vn_DestroyBufferView(VkDevice device,
vk_free(alloc, view); vk_free(alloc, view);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetDeviceBufferMemoryRequirements( vn_GetDeviceBufferMemoryRequirements(
VkDevice device, VkDevice device,
const VkDeviceBufferMemoryRequirements *pInfo, const VkDeviceBufferMemoryRequirements *pInfo,

302
src/virtio/vulkan/vn_command_buffer.c
View file

File diff suppressed because it is too large Load diff

24
src/virtio/vulkan/vn_descriptor_set.c
View file

@ -89,7 +89,7 @@ vn_descriptor_type(VkDescriptorType type)
/* descriptor set layout commands */ /* descriptor set layout commands */
void VKAPI_ATTR void VKAPI_CALL
vn_GetDescriptorSetLayoutSupport( vn_GetDescriptorSetLayoutSupport(
VkDevice device, VkDevice device,
const VkDescriptorSetLayoutCreateInfo *pCreateInfo, const VkDescriptorSetLayoutCreateInfo *pCreateInfo,
@ -193,7 +193,7 @@ vn_descriptor_set_layout_init(
create_info, NULL, &layout_handle); create_info, NULL, &layout_handle);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateDescriptorSetLayout( vn_CreateDescriptorSetLayout(
VkDevice device, VkDevice device,
const VkDescriptorSetLayoutCreateInfo *pCreateInfo, const VkDescriptorSetLayoutCreateInfo *pCreateInfo,
@ -257,7 +257,7 @@ vn_CreateDescriptorSetLayout(
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyDescriptorSetLayout(VkDevice device, vn_DestroyDescriptorSetLayout(VkDevice device,
VkDescriptorSetLayout descriptorSetLayout, VkDescriptorSetLayout descriptorSetLayout,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -274,7 +274,7 @@ vn_DestroyDescriptorSetLayout(VkDevice device,
/* descriptor pool commands */ /* descriptor pool commands */
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateDescriptorPool(VkDevice device, vn_CreateDescriptorPool(VkDevice device,
const VkDescriptorPoolCreateInfo *pCreateInfo, const VkDescriptorPoolCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -398,7 +398,7 @@ vn_CreateDescriptorPool(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyDescriptorPool(VkDevice device, vn_DestroyDescriptorPool(VkDevice device,
VkDescriptorPool descriptorPool, VkDescriptorPool descriptorPool,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -574,7 +574,7 @@ vn_descriptor_pool_reset_descriptors(struct vn_descriptor_pool *pool)
pool->mutable_states[i].used = 0; pool->mutable_states[i].used = 0;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_ResetDescriptorPool(VkDevice device, vn_ResetDescriptorPool(VkDevice device,
VkDescriptorPool descriptorPool, VkDescriptorPool descriptorPool,
VkDescriptorPoolResetFlags flags) VkDescriptorPoolResetFlags flags)
@ -608,7 +608,7 @@ vn_ResetDescriptorPool(VkDevice device,
/* descriptor set commands */ /* descriptor set commands */
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_AllocateDescriptorSets(VkDevice device, vn_AllocateDescriptorSets(VkDevice device,
const VkDescriptorSetAllocateInfo *pAllocateInfo, const VkDescriptorSetAllocateInfo *pAllocateInfo,
VkDescriptorSet *pDescriptorSets) VkDescriptorSet *pDescriptorSets)
@ -753,7 +753,7 @@ fail:
return vn_error(dev->instance, result); return vn_error(dev->instance, result);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_FreeDescriptorSets(VkDevice device, vn_FreeDescriptorSets(VkDevice device,
VkDescriptorPool descriptorPool, VkDescriptorPool descriptorPool,
uint32_t descriptorSetCount, uint32_t descriptorSetCount,
@ -886,7 +886,7 @@ vn_descriptor_set_get_writes(uint32_t write_count,
return local->writes; return local->writes;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_UpdateDescriptorSets(VkDevice device, vn_UpdateDescriptorSets(VkDevice device,
uint32_t descriptorWriteCount, uint32_t descriptorWriteCount,
const VkWriteDescriptorSet *pDescriptorWrites, const VkWriteDescriptorSet *pDescriptorWrites,
@ -959,7 +959,7 @@ vn_descriptor_update_template_init(
} }
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateDescriptorUpdateTemplate( vn_CreateDescriptorUpdateTemplate(
VkDevice device, VkDevice device,
const VkDescriptorUpdateTemplateCreateInfo *pCreateInfo, const VkDescriptorUpdateTemplateCreateInfo *pCreateInfo,
@ -999,7 +999,7 @@ vn_CreateDescriptorUpdateTemplate(
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyDescriptorUpdateTemplate( vn_DestroyDescriptorUpdateTemplate(
VkDevice device, VkDevice device,
VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkDescriptorUpdateTemplate descriptorUpdateTemplate,
@ -1138,7 +1138,7 @@ vn_descriptor_set_fill_update_with_template(
} }
} }
void VKAPI_ATTR void VKAPI_CALL
vn_UpdateDescriptorSetWithTemplate( vn_UpdateDescriptorSetWithTemplate(
VkDevice device, VkDevice device,
VkDescriptorSet descriptorSet, VkDescriptorSet descriptorSet,

10
src/virtio/vulkan/vn_device.c
View file

@ -542,7 +542,7 @@ out_destroy_device:
return result; return result;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateDevice(VkPhysicalDevice physicalDevice, vn_CreateDevice(VkPhysicalDevice physicalDevice,
const VkDeviceCreateInfo *pCreateInfo, const VkDeviceCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -593,7 +593,7 @@ vn_CreateDevice(VkPhysicalDevice physicalDevice,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyDevice(VkDevice device, const VkAllocationCallbacks *pAllocator) vn_DestroyDevice(VkDevice device, const VkAllocationCallbacks *pAllocator)
{ {
VN_TRACE_FUNC(); VN_TRACE_FUNC();
@ -633,14 +633,14 @@ vn_DestroyDevice(VkDevice device, const VkAllocationCallbacks *pAllocator)
vk_free(alloc, dev); vk_free(alloc, dev);
} }
PFN_vkVoidFunction VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL
vn_GetDeviceProcAddr(VkDevice device, const char *pName) vn_GetDeviceProcAddr(VkDevice device, const char *pName)
{ {
struct vn_device *dev = vn_device_from_handle(device); struct vn_device *dev = vn_device_from_handle(device);
return vk_device_get_proc_addr(&dev->base.vk, pName); return vk_device_get_proc_addr(&dev->base.vk, pName);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetDeviceGroupPeerMemoryFeatures( vn_GetDeviceGroupPeerMemoryFeatures(
VkDevice device, VkDevice device,
uint32_t heapIndex, uint32_t heapIndex,
@ -656,7 +656,7 @@ vn_GetDeviceGroupPeerMemoryFeatures(
remoteDeviceIndex, pPeerMemoryFeatures); remoteDeviceIndex, pPeerMemoryFeatures);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetCalibratedTimestampsKHR( vn_GetCalibratedTimestampsKHR(
VkDevice device, VkDevice device,
uint32_t timestampCount, uint32_t timestampCount,

20
src/virtio/vulkan/vn_device_memory.c
View file

@ -352,7 +352,7 @@ vn_device_memory_emit_report(struct vn_device *dev,
mem_type->heapIndex); mem_type->heapIndex);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_AllocateMemory(VkDevice device, vn_AllocateMemory(VkDevice device,
const VkMemoryAllocateInfo *pAllocateInfo, const VkMemoryAllocateInfo *pAllocateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -392,7 +392,7 @@ vn_AllocateMemory(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_FreeMemory(VkDevice device, vn_FreeMemory(VkDevice device,
VkDeviceMemory memory, VkDeviceMemory memory,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -414,7 +414,7 @@ vn_FreeMemory(VkDevice device,
vk_device_memory_destroy(&dev->base.vk, pAllocator, &mem->base.vk); vk_device_memory_destroy(&dev->base.vk, pAllocator, &mem->base.vk);
} }
uint64_t VKAPI_ATTR uint64_t VKAPI_CALL
vn_GetDeviceMemoryOpaqueCaptureAddress( vn_GetDeviceMemoryOpaqueCaptureAddress(
VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfo *pInfo) VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfo *pInfo)
{ {
@ -423,7 +423,7 @@ vn_GetDeviceMemoryOpaqueCaptureAddress(
device, pInfo); device, pInfo);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_MapMemory2(VkDevice device, vn_MapMemory2(VkDevice device,
const VkMemoryMapInfo *pMemoryMapInfo, const VkMemoryMapInfo *pMemoryMapInfo,
void **ppData) void **ppData)
@ -487,13 +487,13 @@ vn_MapMemory2(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_UnmapMemory2(VkDevice device, const VkMemoryUnmapInfo *pMemoryUnmapInfo) vn_UnmapMemory2(VkDevice device, const VkMemoryUnmapInfo *pMemoryUnmapInfo)
{ {
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_FlushMappedMemoryRanges(VkDevice device, vn_FlushMappedMemoryRanges(VkDevice device,
uint32_t memoryRangeCount, uint32_t memoryRangeCount,
const VkMappedMemoryRange *pMemoryRanges) const VkMappedMemoryRange *pMemoryRanges)
@ -514,7 +514,7 @@ vn_FlushMappedMemoryRanges(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_InvalidateMappedMemoryRanges(VkDevice device, vn_InvalidateMappedMemoryRanges(VkDevice device,
uint32_t memoryRangeCount, uint32_t memoryRangeCount,
const VkMappedMemoryRange *pMemoryRanges) const VkMappedMemoryRange *pMemoryRanges)
@ -536,7 +536,7 @@ vn_InvalidateMappedMemoryRanges(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetDeviceMemoryCommitment(VkDevice device, vn_GetDeviceMemoryCommitment(VkDevice device,
VkDeviceMemory memory, VkDeviceMemory memory,
VkDeviceSize *pCommittedMemoryInBytes) VkDeviceSize *pCommittedMemoryInBytes)
@ -546,7 +546,7 @@ vn_GetDeviceMemoryCommitment(VkDevice device,
pCommittedMemoryInBytes); pCommittedMemoryInBytes);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetMemoryFdKHR(VkDevice device, vn_GetMemoryFdKHR(VkDevice device,
const VkMemoryGetFdInfoKHR *pGetFdInfo, const VkMemoryGetFdInfoKHR *pGetFdInfo,
int *pFd) int *pFd)
@ -601,7 +601,7 @@ vn_get_memory_dma_buf_properties(struct vn_device *dev,
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetMemoryFdPropertiesKHR(VkDevice device, vn_GetMemoryFdPropertiesKHR(VkDevice device,
VkExternalMemoryHandleTypeFlagBits handleType, VkExternalMemoryHandleTypeFlagBits handleType,
int fd, int fd,

8
src/virtio/vulkan/vn_host_copy.c
View file

@ -10,7 +10,7 @@
#include "vn_device.h" #include "vn_device.h"
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_TransitionImageLayout(VkDevice device, vn_TransitionImageLayout(VkDevice device,
uint32_t transitionCount, uint32_t transitionCount,
const VkHostImageLayoutTransitionInfo *pTransitions) const VkHostImageLayoutTransitionInfo *pTransitions)
@ -23,7 +23,7 @@ vn_TransitionImageLayout(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CopyImageToImage(VkDevice device, vn_CopyImageToImage(VkDevice device,
const VkCopyImageToImageInfo *pCopyImageToImageInfo) const VkCopyImageToImageInfo *pCopyImageToImageInfo)
{ {
@ -120,7 +120,7 @@ vn_get_copy_size(VkImage img_handle,
return last_row_size + last_row_offset; return last_row_size + last_row_offset;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CopyImageToMemory(VkDevice device, vn_CopyImageToMemory(VkDevice device,
const VkCopyImageToMemoryInfo *pCopyImageToMemoryInfo) const VkCopyImageToMemoryInfo *pCopyImageToMemoryInfo)
{ {
@ -165,7 +165,7 @@ vn_CopyImageToMemory(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CopyMemoryToImage(VkDevice device, vn_CopyMemoryToImage(VkDevice device,
const VkCopyMemoryToImageInfo *pCopyMemoryToImageInfo) const VkCopyMemoryToImageInfo *pCopyMemoryToImageInfo)
{ {

2
src/virtio/vulkan/vn_icd.c
View file

@ -12,7 +12,7 @@
#include "vn_instance.h" #include "vn_instance.h"
PFN_vkVoidFunction VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL
vk_icdGetInstanceProcAddr(VkInstance instance, const char *pName) vk_icdGetInstanceProcAddr(VkInstance instance, const char *pName)
{ {
return vn_GetInstanceProcAddr(instance, pName); return vn_GetInstanceProcAddr(instance, pName);

34
src/virtio/vulkan/vn_image.c
View file

@ -618,7 +618,7 @@ vn_image_fix_create_info(
return &local_info->create; return &local_info->create;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateImage(VkDevice device, vn_CreateImage(VkDevice device,
const VkImageCreateInfo *pCreateInfo, const VkImageCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -709,7 +709,7 @@ vn_CreateImage(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyImage(VkDevice device, vn_DestroyImage(VkDevice device,
VkImage image, VkImage image,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -736,7 +736,7 @@ vn_DestroyImage(VkDevice device,
vk_image_destroy(&dev->base.vk, alloc, &img->base.vk); vk_image_destroy(&dev->base.vk, alloc, &img->base.vk);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetImageMemoryRequirements2(VkDevice device, vn_GetImageMemoryRequirements2(VkDevice device,
const VkImageMemoryRequirementsInfo2 *pInfo, const VkImageMemoryRequirementsInfo2 *pInfo,
VkMemoryRequirements2 *pMemoryRequirements) VkMemoryRequirements2 *pMemoryRequirements)
@ -753,7 +753,7 @@ vn_GetImageMemoryRequirements2(VkDevice device,
vn_image_fill_reqs(&img->requirements[plane], pMemoryRequirements); vn_image_fill_reqs(&img->requirements[plane], pMemoryRequirements);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetImageSparseMemoryRequirements2( vn_GetImageSparseMemoryRequirements2(
VkDevice device, VkDevice device,
const VkImageSparseMemoryRequirementsInfo2 *pInfo, const VkImageSparseMemoryRequirementsInfo2 *pInfo,
@ -817,7 +817,7 @@ vn_image_bind_wsi_memory(struct vn_device *dev,
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_BindImageMemory2(VkDevice device, vn_BindImageMemory2(VkDevice device,
uint32_t bindInfoCount, uint32_t bindInfoCount,
const VkBindImageMemoryInfo *pBindInfos) const VkBindImageMemoryInfo *pBindInfos)
@ -842,7 +842,7 @@ vn_BindImageMemory2(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetImageDrmFormatModifierPropertiesEXT( vn_GetImageDrmFormatModifierPropertiesEXT(
VkDevice device, VkDevice device,
VkImage image, VkImage image,
@ -877,7 +877,7 @@ vn_image_get_aspect(struct vn_image *img, VkImageAspectFlags aspect)
UNREACHABLE("unexpected aspect"); UNREACHABLE("unexpected aspect");
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetImageSubresourceLayout(VkDevice device, vn_GetImageSubresourceLayout(VkDevice device,
VkImage image, VkImage image,
const VkImageSubresource *pSubresource, const VkImageSubresource *pSubresource,
@ -903,7 +903,7 @@ vn_GetImageSubresourceLayout(VkDevice device,
/* image view commands */ /* image view commands */
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateImageView(VkDevice device, vn_CreateImageView(VkDevice device,
const VkImageViewCreateInfo *pCreateInfo, const VkImageViewCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -941,7 +941,7 @@ vn_CreateImageView(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyImageView(VkDevice device, vn_DestroyImageView(VkDevice device,
VkImageView imageView, VkImageView imageView,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -962,7 +962,7 @@ vn_DestroyImageView(VkDevice device,
/* sampler commands */ /* sampler commands */
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateSampler(VkDevice device, vn_CreateSampler(VkDevice device,
const VkSamplerCreateInfo *pCreateInfo, const VkSamplerCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -989,7 +989,7 @@ vn_CreateSampler(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroySampler(VkDevice device, vn_DestroySampler(VkDevice device,
VkSampler _sampler, VkSampler _sampler,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -1010,7 +1010,7 @@ vn_DestroySampler(VkDevice device,
/* sampler YCbCr conversion commands */ /* sampler YCbCr conversion commands */
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateSamplerYcbcrConversion( vn_CreateSamplerYcbcrConversion(
VkDevice device, VkDevice device,
const VkSamplerYcbcrConversionCreateInfo *pCreateInfo, const VkSamplerYcbcrConversionCreateInfo *pCreateInfo,
@ -1057,7 +1057,7 @@ vn_CreateSamplerYcbcrConversion(
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroySamplerYcbcrConversion(VkDevice device, vn_DestroySamplerYcbcrConversion(VkDevice device,
VkSamplerYcbcrConversion ycbcrConversion, VkSamplerYcbcrConversion ycbcrConversion,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -1078,7 +1078,7 @@ vn_DestroySamplerYcbcrConversion(VkDevice device,
vk_free(alloc, conv); vk_free(alloc, conv);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetDeviceImageMemoryRequirements( vn_GetDeviceImageMemoryRequirements(
VkDevice device, VkDevice device,
const VkDeviceImageMemoryRequirements *pInfo, const VkDeviceImageMemoryRequirements *pInfo,
@ -1135,7 +1135,7 @@ vn_GetDeviceImageMemoryRequirements(
} }
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetDeviceImageSparseMemoryRequirements( vn_GetDeviceImageSparseMemoryRequirements(
VkDevice device, VkDevice device,
const VkDeviceImageMemoryRequirements *pInfo, const VkDeviceImageMemoryRequirements *pInfo,
@ -1156,7 +1156,7 @@ vn_GetDeviceImageSparseMemoryRequirements(
pSparseMemoryRequirements); pSparseMemoryRequirements);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetDeviceImageSubresourceLayout(VkDevice device, vn_GetDeviceImageSubresourceLayout(VkDevice device,
const VkDeviceImageSubresourceInfo *pInfo, const VkDeviceImageSubresourceInfo *pInfo,
VkSubresourceLayout2 *pLayout) VkSubresourceLayout2 *pLayout)
@ -1168,7 +1168,7 @@ vn_GetDeviceImageSubresourceLayout(VkDevice device,
pLayout); pLayout);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetImageSubresourceLayout2(VkDevice device, vn_GetImageSubresourceLayout2(VkDevice device,
VkImage image, VkImage image,
const VkImageSubresource2 *pSubresource, const VkImageSubresource2 *pSubresource,

12
src/virtio/vulkan/vn_instance.c
View file

@ -237,14 +237,14 @@ out_renderer_destroy:
/* instance commands */ /* instance commands */
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_EnumerateInstanceVersion(uint32_t *pApiVersion) vn_EnumerateInstanceVersion(uint32_t *pApiVersion)
{ {
*pApiVersion = VN_MAX_API_VERSION; *pApiVersion = VN_MAX_API_VERSION;
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_EnumerateInstanceExtensionProperties(const char *pLayerName, vn_EnumerateInstanceExtensionProperties(const char *pLayerName,
uint32_t *pPropertyCount, uint32_t *pPropertyCount,
VkExtensionProperties *pProperties) VkExtensionProperties *pProperties)
@ -256,7 +256,7 @@ vn_EnumerateInstanceExtensionProperties(const char *pLayerName,
&vn_instance_supported_extensions, pPropertyCount, pProperties); &vn_instance_supported_extensions, pPropertyCount, pProperties);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_EnumerateInstanceLayerProperties(uint32_t *pPropertyCount, vn_EnumerateInstanceLayerProperties(uint32_t *pPropertyCount,
VkLayerProperties *pProperties) VkLayerProperties *pProperties)
{ {
@ -264,7 +264,7 @@ vn_EnumerateInstanceLayerProperties(uint32_t *pPropertyCount,
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, vn_CreateInstance(const VkInstanceCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
VkInstance *pInstance) VkInstance *pInstance)
@ -411,7 +411,7 @@ out_mtx_destroy:
return vn_error(NULL, result); return vn_error(NULL, result);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyInstance(VkInstance _instance, vn_DestroyInstance(VkInstance _instance,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
{ {
@ -459,7 +459,7 @@ vn_DestroyInstance(VkInstance _instance,
vk_free(alloc, instance); vk_free(alloc, instance);
} }
PFN_vkVoidFunction VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL
vn_GetInstanceProcAddr(VkInstance _instance, const char *pName) vn_GetInstanceProcAddr(VkInstance _instance, const char *pName)
{ {
struct vn_instance *instance = vn_instance_from_handle(_instance); struct vn_instance *instance = vn_instance_from_handle(_instance);

34
src/virtio/vulkan/vn_physical_device.c
View file

@ -1962,7 +1962,7 @@ unlock:
/* physical device commands */ /* physical device commands */
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_EnumeratePhysicalDevices(VkInstance _instance, vn_EnumeratePhysicalDevices(VkInstance _instance,
uint32_t *pPhysicalDeviceCount, uint32_t *pPhysicalDeviceCount,
VkPhysicalDevice *pPhysicalDevices) VkPhysicalDevice *pPhysicalDevices)
@ -1986,7 +1986,7 @@ vn_EnumeratePhysicalDevices(VkInstance _instance,
return vk_outarray_status(&out); return vk_outarray_status(&out);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_EnumeratePhysicalDeviceGroups( vn_EnumeratePhysicalDeviceGroups(
VkInstance _instance, VkInstance _instance,
uint32_t *pPhysicalDeviceGroupCount, uint32_t *pPhysicalDeviceGroupCount,
@ -2011,7 +2011,7 @@ vn_EnumeratePhysicalDeviceGroups(
return vk_outarray_status(&out); return vk_outarray_status(&out);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, vn_EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice,
const char *pLayerName, const char *pLayerName,
uint32_t *pPropertyCount, uint32_t *pPropertyCount,
@ -2037,7 +2037,7 @@ vn_EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice,
return vk_outarray_status(&out); return vk_outarray_status(&out);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_EnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, vn_EnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice,
uint32_t *pPropertyCount, uint32_t *pPropertyCount,
VkLayerProperties *pProperties) VkLayerProperties *pProperties)
@ -2046,7 +2046,7 @@ vn_EnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, vn_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
VkPhysicalDeviceProperties2 *pProperties) VkPhysicalDeviceProperties2 *pProperties)
{ {
@ -2096,7 +2096,7 @@ vn_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
} }
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetPhysicalDeviceQueueFamilyProperties2( vn_GetPhysicalDeviceQueueFamilyProperties2(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
uint32_t *pQueueFamilyPropertyCount, uint32_t *pQueueFamilyPropertyCount,
@ -2126,7 +2126,7 @@ vn_GetPhysicalDeviceQueueFamilyProperties2(
} }
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetPhysicalDeviceMemoryProperties2( vn_GetPhysicalDeviceMemoryProperties2(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
VkPhysicalDeviceMemoryProperties2 *pMemoryProperties) VkPhysicalDeviceMemoryProperties2 *pMemoryProperties)
@ -2198,7 +2198,7 @@ vn_sanitize_format_properties(VkFormat format,
} }
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice, vn_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice,
VkFormat format, VkFormat format,
VkFormatProperties2 *pFormatProperties) VkFormatProperties2 *pFormatProperties)
@ -2732,7 +2732,7 @@ vn_get_ahb_image_props(struct vn_physical_device *physical_dev,
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetPhysicalDeviceImageFormatProperties2( vn_GetPhysicalDeviceImageFormatProperties2(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo,
@ -2841,7 +2841,7 @@ vn_GetPhysicalDeviceImageFormatProperties2(
return vn_result(physical_dev->instance, result); return vn_result(physical_dev->instance, result);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetPhysicalDeviceSparseImageFormatProperties2( vn_GetPhysicalDeviceSparseImageFormatProperties2(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceSparseImageFormatInfo2 *pFormatInfo, const VkPhysicalDeviceSparseImageFormatInfo2 *pFormatInfo,
@ -2866,7 +2866,7 @@ vn_GetPhysicalDeviceSparseImageFormatProperties2(
ring, physicalDevice, pFormatInfo, pPropertyCount, pProperties); ring, physicalDevice, pFormatInfo, pPropertyCount, pProperties);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetPhysicalDeviceExternalBufferProperties( vn_GetPhysicalDeviceExternalBufferProperties(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo, const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo,
@ -2924,7 +2924,7 @@ vn_GetPhysicalDeviceExternalBufferProperties(
: 0; : 0;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetPhysicalDeviceExternalFenceProperties( vn_GetPhysicalDeviceExternalFenceProperties(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalFenceInfo *pExternalFenceInfo, const VkPhysicalDeviceExternalFenceInfo *pExternalFenceInfo,
@ -2949,7 +2949,7 @@ vn_GetPhysicalDeviceExternalFenceProperties(
} }
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetPhysicalDeviceExternalSemaphoreProperties( vn_GetPhysicalDeviceExternalSemaphoreProperties(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo, const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo,
@ -2980,7 +2980,7 @@ vn_GetPhysicalDeviceExternalSemaphoreProperties(
} }
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetPhysicalDeviceCalibrateableTimeDomainsKHR( vn_GetPhysicalDeviceCalibrateableTimeDomainsKHR(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
uint32_t *pTimeDomainCount, uint32_t *pTimeDomainCount,
@ -2994,7 +2994,7 @@ vn_GetPhysicalDeviceCalibrateableTimeDomainsKHR(
ring, physicalDevice, pTimeDomainCount, pTimeDomains); ring, physicalDevice, pTimeDomainCount, pTimeDomains);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetPhysicalDeviceCooperativeMatrixPropertiesKHR( vn_GetPhysicalDeviceCooperativeMatrixPropertiesKHR(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
uint32_t *pPropertyCount, uint32_t *pPropertyCount,
@ -3008,7 +3008,7 @@ vn_GetPhysicalDeviceCooperativeMatrixPropertiesKHR(
ring, physicalDevice, pPropertyCount, pProperties); ring, physicalDevice, pPropertyCount, pProperties);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetPhysicalDeviceFragmentShadingRatesKHR( vn_GetPhysicalDeviceFragmentShadingRatesKHR(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
uint32_t *pFragmentShadingRateCount, uint32_t *pFragmentShadingRateCount,
@ -3022,7 +3022,7 @@ vn_GetPhysicalDeviceFragmentShadingRatesKHR(
ring, physicalDevice, pFragmentShadingRateCount, pFragmentShadingRates); ring, physicalDevice, pFragmentShadingRateCount, pFragmentShadingRates);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_GetPhysicalDeviceMultisamplePropertiesEXT( vn_GetPhysicalDeviceMultisamplePropertiesEXT(
VkPhysicalDevice physicalDevice, VkPhysicalDevice physicalDevice,
VkSampleCountFlagBits samples, VkSampleCountFlagBits samples,

30
src/virtio/vulkan/vn_pipeline.c
View file

@ -244,7 +244,7 @@ struct vn_graphics_pipeline_fix_tmp {
/* shader module commands */ /* shader module commands */
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateShaderModule(VkDevice device, vn_CreateShaderModule(VkDevice device,
const VkShaderModuleCreateInfo *pCreateInfo, const VkShaderModuleCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -271,7 +271,7 @@ vn_CreateShaderModule(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyShaderModule(VkDevice device, vn_DestroyShaderModule(VkDevice device,
VkShaderModule shaderModule, VkShaderModule shaderModule,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -326,7 +326,7 @@ vn_pipeline_layout_unref(struct vn_device *dev,
vn_pipeline_layout_destroy(dev, pipeline_layout); vn_pipeline_layout_destroy(dev, pipeline_layout);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreatePipelineLayout(VkDevice device, vn_CreatePipelineLayout(VkDevice device,
const VkPipelineLayoutCreateInfo *pCreateInfo, const VkPipelineLayoutCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -378,7 +378,7 @@ vn_CreatePipelineLayout(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyPipelineLayout(VkDevice device, vn_DestroyPipelineLayout(VkDevice device,
VkPipelineLayout pipelineLayout, VkPipelineLayout pipelineLayout,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -395,7 +395,7 @@ vn_DestroyPipelineLayout(VkDevice device,
/* pipeline cache commands */ /* pipeline cache commands */
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreatePipelineCache(VkDevice device, vn_CreatePipelineCache(VkDevice device,
const VkPipelineCacheCreateInfo *pCreateInfo, const VkPipelineCacheCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -434,7 +434,7 @@ vn_CreatePipelineCache(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyPipelineCache(VkDevice device, vn_DestroyPipelineCache(VkDevice device,
VkPipelineCache pipelineCache, VkPipelineCache pipelineCache,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -480,7 +480,7 @@ vn_get_target_ring(struct vn_device *dev)
return ring; return ring;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetPipelineCacheData(VkDevice device, vn_GetPipelineCacheData(VkDevice device,
VkPipelineCache pipelineCache, VkPipelineCache pipelineCache,
size_t *pDataSize, size_t *pDataSize,
@ -526,7 +526,7 @@ vn_GetPipelineCacheData(VkDevice device,
return result; return result;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_MergePipelineCaches(VkDevice device, vn_MergePipelineCaches(VkDevice device,
VkPipelineCache dstCache, VkPipelineCache dstCache,
uint32_t srcCacheCount, uint32_t srcCacheCount,
@ -1667,7 +1667,7 @@ vn_pipeline_create_flags2(const void *pnext, VkPipelineCreateFlags flags)
return flags2 ? flags2->flags : flags; return flags2 ? flags2->flags : flags;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateGraphicsPipelines(VkDevice device, vn_CreateGraphicsPipelines(VkDevice device,
VkPipelineCache pipelineCache, VkPipelineCache pipelineCache,
uint32_t createInfoCount, uint32_t createInfoCount,
@ -1760,7 +1760,7 @@ vn_CreateGraphicsPipelines(VkDevice device,
return vn_result(dev->instance, result); return vn_result(dev->instance, result);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateComputePipelines(VkDevice device, vn_CreateComputePipelines(VkDevice device,
VkPipelineCache pipelineCache, VkPipelineCache pipelineCache,
uint32_t createInfoCount, uint32_t createInfoCount,
@ -1821,7 +1821,7 @@ vn_CreateComputePipelines(VkDevice device,
return vn_result(dev->instance, result); return vn_result(dev->instance, result);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyPipeline(VkDevice device, vn_DestroyPipeline(VkDevice device,
VkPipeline _pipeline, VkPipeline _pipeline,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -1844,7 +1844,7 @@ vn_DestroyPipeline(VkDevice device,
vk_free(alloc, pipeline); vk_free(alloc, pipeline);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateRayTracingPipelinesKHR( vn_CreateRayTracingPipelinesKHR(
VkDevice device, VkDevice device,
VkDeferredOperationKHR deferredOperation, VkDeferredOperationKHR deferredOperation,
@ -1914,7 +1914,7 @@ vn_CreateRayTracingPipelinesKHR(
return vn_result(dev->instance, result); return vn_result(dev->instance, result);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetRayTracingCaptureReplayShaderGroupHandlesKHR(VkDevice device, vn_GetRayTracingCaptureReplayShaderGroupHandlesKHR(VkDevice device,
VkPipeline pipeline, VkPipeline pipeline,
uint32_t firstGroup, uint32_t firstGroup,
@ -1929,7 +1929,7 @@ vn_GetRayTracingCaptureReplayShaderGroupHandlesKHR(VkDevice device,
pData); pData);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetRayTracingShaderGroupHandlesKHR(VkDevice device, vn_GetRayTracingShaderGroupHandlesKHR(VkDevice device,
VkPipeline pipeline, VkPipeline pipeline,
uint32_t firstGroup, uint32_t firstGroup,
@ -1944,7 +1944,7 @@ vn_GetRayTracingShaderGroupHandlesKHR(VkDevice device,
pData); pData);
} }
VkDeviceSize VKAPI_ATTR VkDeviceSize VKAPI_CALL
vn_GetRayTracingShaderGroupStackSizeKHR(VkDevice device, vn_GetRayTracingShaderGroupStackSizeKHR(VkDevice device,
VkPipeline pipeline, VkPipeline pipeline,
uint32_t group, uint32_t group,

8
src/virtio/vulkan/vn_query_pool.c
View file

@ -18,7 +18,7 @@
/* query pool commands */ /* query pool commands */
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateQueryPool(VkDevice device, vn_CreateQueryPool(VkDevice device,
const VkQueryPoolCreateInfo *pCreateInfo, const VkQueryPoolCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -152,7 +152,7 @@ vn_CreateQueryPool(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyQueryPool(VkDevice device, vn_DestroyQueryPool(VkDevice device,
VkQueryPool queryPool, VkQueryPool queryPool,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -177,7 +177,7 @@ vn_DestroyQueryPool(VkDevice device,
vk_free(alloc, pool); vk_free(alloc, pool);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_ResetQueryPool(VkDevice device, vn_ResetQueryPool(VkDevice device,
VkQueryPool queryPool, VkQueryPool queryPool,
uint32_t firstQuery, uint32_t firstQuery,
@ -299,7 +299,7 @@ vn_query_feedback_wait_ready(struct vn_device *dev,
vn_relax_fini(&relax_state); vn_relax_fini(&relax_state);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetQueryPoolResults(VkDevice device, vn_GetQueryPoolResults(VkDevice device,
VkQueryPool queryPool, VkQueryPool queryPool,
uint32_t firstQuery, uint32_t firstQuery,

46
src/virtio/vulkan/vn_queue.c
View file

@ -1075,7 +1075,7 @@ vn_queue_submit(struct vn_queue_submission *submit)
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_QueueSubmit(VkQueue queue, vn_QueueSubmit(VkQueue queue,
uint32_t submitCount, uint32_t submitCount,
const VkSubmitInfo *pSubmits, const VkSubmitInfo *pSubmits,
@ -1221,7 +1221,7 @@ vn_queue_submit_2_to_1(struct vn_device *dev,
return result; return result;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_QueueSubmit2(VkQueue queue, vn_QueueSubmit2(VkQueue queue,
uint32_t submitCount, uint32_t submitCount,
const VkSubmitInfo2 *pSubmits, const VkSubmitInfo2 *pSubmits,
@ -1425,7 +1425,7 @@ vn_queue_bind_sparse_submit_batch(struct vn_queue_submission *submit,
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_QueueBindSparse(VkQueue queue, vn_QueueBindSparse(VkQueue queue,
uint32_t bindInfoCount, uint32_t bindInfoCount,
const VkBindSparseInfo *pBindInfo, const VkBindSparseInfo *pBindInfo,
@ -1471,7 +1471,7 @@ vn_QueueBindSparse(VkQueue queue,
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_QueueWaitIdle(VkQueue _queue) vn_QueueWaitIdle(VkQueue _queue)
{ {
VN_TRACE_FUNC(); VN_TRACE_FUNC();
@ -1604,7 +1604,7 @@ vn_fence_feedback_fini(struct vn_device *dev,
vk_free(alloc, fence->feedback.commands); vk_free(alloc, fence->feedback.commands);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateFence(VkDevice device, vn_CreateFence(VkDevice device,
const VkFenceCreateInfo *pCreateInfo, const VkFenceCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -1652,7 +1652,7 @@ out_object_base_fini:
return vn_error(dev->instance, result); return vn_error(dev->instance, result);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyFence(VkDevice device, vn_DestroyFence(VkDevice device,
VkFence _fence, VkFence _fence,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -1677,7 +1677,7 @@ vn_DestroyFence(VkDevice device,
vk_free(alloc, fence); vk_free(alloc, fence);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_ResetFences(VkDevice device, uint32_t fenceCount, const VkFence *pFences) vn_ResetFences(VkDevice device, uint32_t fenceCount, const VkFence *pFences)
{ {
VN_TRACE_FUNC(); VN_TRACE_FUNC();
@ -1703,7 +1703,7 @@ vn_ResetFences(VkDevice device, uint32_t fenceCount, const VkFence *pFences)
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetFenceStatus(VkDevice device, VkFence _fence) vn_GetFenceStatus(VkDevice device, VkFence _fence)
{ {
struct vn_device *dev = vn_device_from_handle(device); struct vn_device *dev = vn_device_from_handle(device);
@ -1799,7 +1799,7 @@ vn_update_sync_result(struct vn_device *dev,
return result; return result;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_WaitForFences(VkDevice device, vn_WaitForFences(VkDevice device,
uint32_t fenceCount, uint32_t fenceCount,
const VkFence *pFences, const VkFence *pFences,
@ -1893,7 +1893,7 @@ vn_sync_valid_fd(int fd)
return (fd >= 0 && sync_valid_fd(fd)) || fd == -1; return (fd >= 0 && sync_valid_fd(fd)) || fd == -1;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_ImportFenceFdKHR(VkDevice device, vn_ImportFenceFdKHR(VkDevice device,
const VkImportFenceFdInfoKHR *pImportFenceFdInfo) const VkImportFenceFdInfoKHR *pImportFenceFdInfo)
{ {
@ -1918,7 +1918,7 @@ vn_ImportFenceFdKHR(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetFenceFdKHR(VkDevice device, vn_GetFenceFdKHR(VkDevice device,
const VkFenceGetFdInfoKHR *pGetFdInfo, const VkFenceGetFdInfoKHR *pGetFdInfo,
int *pFd) int *pFd)
@ -2084,7 +2084,7 @@ vn_semaphore_feedback_fini(struct vn_device *dev, struct vn_semaphore *sem)
vn_feedback_pool_free(&dev->feedback_pool, sem->feedback.slot); vn_feedback_pool_free(&dev->feedback_pool, sem->feedback.slot);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateSemaphore(VkDevice device, vn_CreateSemaphore(VkDevice device,
const VkSemaphoreCreateInfo *pCreateInfo, const VkSemaphoreCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -2144,7 +2144,7 @@ out_object_base_fini:
return vn_error(dev->instance, result); return vn_error(dev->instance, result);
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroySemaphore(VkDevice device, vn_DestroySemaphore(VkDevice device,
VkSemaphore semaphore, VkSemaphore semaphore,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -2170,7 +2170,7 @@ vn_DestroySemaphore(VkDevice device,
vk_free(alloc, sem); vk_free(alloc, sem);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetSemaphoreCounterValue(VkDevice device, vn_GetSemaphoreCounterValue(VkDevice device,
VkSemaphore semaphore, VkSemaphore semaphore,
uint64_t *pValue) uint64_t *pValue)
@ -2271,7 +2271,7 @@ vn_GetSemaphoreCounterValue(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_SignalSemaphore(VkDevice device, const VkSemaphoreSignalInfo *pSignalInfo) vn_SignalSemaphore(VkDevice device, const VkSemaphoreSignalInfo *pSignalInfo)
{ {
VN_TRACE_FUNC(); VN_TRACE_FUNC();
@ -2338,7 +2338,7 @@ vn_remove_signaled_semaphores(VkDevice device,
return cur ? VK_NOT_READY : VK_SUCCESS; return cur ? VK_NOT_READY : VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_WaitSemaphores(VkDevice device, vn_WaitSemaphores(VkDevice device,
const VkSemaphoreWaitInfo *pWaitInfo, const VkSemaphoreWaitInfo *pWaitInfo,
uint64_t timeout) uint64_t timeout)
@ -2384,7 +2384,7 @@ vn_WaitSemaphores(VkDevice device,
return vn_result(dev->instance, result); return vn_result(dev->instance, result);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_ImportSemaphoreFdKHR( vn_ImportSemaphoreFdKHR(
VkDevice device, const VkImportSemaphoreFdInfoKHR *pImportSemaphoreFdInfo) VkDevice device, const VkImportSemaphoreFdInfoKHR *pImportSemaphoreFdInfo)
{ {
@ -2411,7 +2411,7 @@ vn_ImportSemaphoreFdKHR(
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetSemaphoreFdKHR(VkDevice device, vn_GetSemaphoreFdKHR(VkDevice device,
const VkSemaphoreGetFdInfoKHR *pGetFdInfo, const VkSemaphoreGetFdInfoKHR *pGetFdInfo,
int *pFd) int *pFd)
@ -2502,7 +2502,7 @@ vn_event_feedback_fini(struct vn_device *dev, struct vn_event *ev)
vn_feedback_pool_free(&dev->feedback_pool, ev->feedback_slot); vn_feedback_pool_free(&dev->feedback_pool, ev->feedback_slot);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_CreateEvent(VkDevice device, vn_CreateEvent(VkDevice device,
const VkEventCreateInfo *pCreateInfo, const VkEventCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, const VkAllocationCallbacks *pAllocator,
@ -2536,7 +2536,7 @@ vn_CreateEvent(VkDevice device,
return VK_SUCCESS; return VK_SUCCESS;
} }
void VKAPI_ATTR void VKAPI_CALL
vn_DestroyEvent(VkDevice device, vn_DestroyEvent(VkDevice device,
VkEvent event, VkEvent event,
const VkAllocationCallbacks *pAllocator) const VkAllocationCallbacks *pAllocator)
@ -2558,7 +2558,7 @@ vn_DestroyEvent(VkDevice device,
vk_free(alloc, ev); vk_free(alloc, ev);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_GetEventStatus(VkDevice device, VkEvent event) vn_GetEventStatus(VkDevice device, VkEvent event)
{ {
VN_TRACE_FUNC(); VN_TRACE_FUNC();
@ -2574,7 +2574,7 @@ vn_GetEventStatus(VkDevice device, VkEvent event)
return vn_result(dev->instance, result); return vn_result(dev->instance, result);
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_SetEvent(VkDevice device, VkEvent event) vn_SetEvent(VkDevice device, VkEvent event)
{ {
VN_TRACE_FUNC(); VN_TRACE_FUNC();
@ -2593,7 +2593,7 @@ vn_SetEvent(VkDevice device, VkEvent event)
return VK_SUCCESS; return VK_SUCCESS;
} }
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_ResetEvent(VkDevice device, VkEvent event) vn_ResetEvent(VkDevice device, VkEvent event)
{ {
VN_TRACE_FUNC(); VN_TRACE_FUNC();

4
src/virtio/vulkan/vn_wsi.c
View file

@ -51,7 +51,7 @@
/* cast a WSI object to a pointer for logging */ /* cast a WSI object to a pointer for logging */
#define VN_WSI_PTR(obj) ((const void *)(uintptr_t)(obj)) #define VN_WSI_PTR(obj) ((const void *)(uintptr_t)(obj))
static PFN_vkVoidFunction static VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL
vn_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName) vn_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName)
{ {
struct vn_physical_device *physical_dev = struct vn_physical_device *physical_dev =
@ -251,7 +251,7 @@ vn_wsi_validate_image_format_info(struct vn_physical_device *physical_dev,
/* swapchain commands */ /* swapchain commands */
VkResult VKAPI_ATTR VkResult VKAPI_CALL
vn_AcquireNextImage2KHR(VkDevice device, vn_AcquireNextImage2KHR(VkDevice device,
const VkAcquireNextImageInfoKHR *pAcquireInfo, const VkAcquireNextImageInfoKHR *pAcquireInfo,
uint32_t *pImageIndex) uint32_t *pImageIndex)