From b7d30f10f9118a1e29c4a05c61bfa8ab87d0a4ec Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Fri, 15 Dec 2023 13:42:29 +0100 Subject: [PATCH] panvk: Add VKAPI_{ATTR,CALL} specifiers to all panvk-specific entrypoints Signed-off-by: Boris Brezillon Reviewed-by: Erik Faye-Lund Part-of: --- src/panfrost/vulkan/panvk_cmd_buffer.c | 40 +++++----- src/panfrost/vulkan/panvk_descriptor_set.c | 16 ++-- src/panfrost/vulkan/panvk_device.c | 76 +++++++++---------- src/panfrost/vulkan/panvk_formats.c | 14 ++-- src/panfrost/vulkan/panvk_image.c | 12 +-- src/panfrost/vulkan/panvk_pass.c | 6 +- src/panfrost/vulkan/panvk_pipeline.c | 2 +- src/panfrost/vulkan/panvk_query.c | 16 ++-- src/panfrost/vulkan/panvk_vX_cmd_buffer.c | 28 +++---- src/panfrost/vulkan/panvk_vX_descriptor_set.c | 8 +- src/panfrost/vulkan/panvk_vX_device.c | 2 +- src/panfrost/vulkan/panvk_vX_image.c | 4 +- src/panfrost/vulkan/panvk_vX_meta_blit.c | 4 +- src/panfrost/vulkan/panvk_vX_meta_clear.c | 6 +- src/panfrost/vulkan/panvk_vX_meta_copy.c | 12 +-- src/panfrost/vulkan/panvk_vX_pipeline.c | 4 +- 16 files changed, 125 insertions(+), 125 deletions(-) diff --git a/src/panfrost/vulkan/panvk_cmd_buffer.c b/src/panfrost/vulkan/panvk_cmd_buffer.c index 5f4ed0ce279..28ea81ae68c 100644 --- a/src/panfrost/vulkan/panvk_cmd_buffer.c +++ b/src/panfrost/vulkan/panvk_cmd_buffer.c @@ -34,7 +34,7 @@ #include "util/rounding.h" #include "vk_format.h" -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdBindVertexBuffers(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets) @@ -59,7 +59,7 @@ panvk_CmdBindVertexBuffers(VkCommandBuffer commandBuffer, uint32_t firstBinding, desc_state->vs_attrib_bufs = desc_state->vs_attribs = 0; } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdBindIndexBuffer(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) { @@ -106,7 +106,7 @@ panvk_set_dyn_ssbo_pointers(struct panvk_descriptor_state *desc_state, desc_state->sysvals_ptr = 0; } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdBindDescriptorSets(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, @@ -183,7 +183,7 @@ panvk_CmdBindDescriptorSets(VkCommandBuffer commandBuffer, assert(dynoffset_idx == dynamicOffsetCount); } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void *pValues) @@ -209,7 +209,7 @@ panvk_CmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, } } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline _pipeline) @@ -241,7 +241,7 @@ panvk_CmdBindPipeline(VkCommandBuffer commandBuffer, cmdbuf->bind_points[pipelineBindPoint].desc_state.ubos = 0; } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdSetViewport(VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewport *pViewports) { @@ -254,7 +254,7 @@ panvk_CmdSetViewport(VkCommandBuffer commandBuffer, uint32_t firstViewport, cmdbuf->state.dirty |= PANVK_DYNAMIC_VIEWPORT; } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdSetScissor(VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_t scissorCount, const VkRect2D *pScissors) { @@ -267,7 +267,7 @@ panvk_CmdSetScissor(VkCommandBuffer commandBuffer, uint32_t firstScissor, cmdbuf->state.dirty |= PANVK_DYNAMIC_SCISSOR; } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) { VK_FROM_HANDLE(panvk_cmd_buffer, cmdbuf, commandBuffer); @@ -276,7 +276,7 @@ panvk_CmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) cmdbuf->state.dirty |= PANVK_DYNAMIC_LINE_WIDTH; } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdSetDepthBias(VkCommandBuffer commandBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor) @@ -290,7 +290,7 @@ panvk_CmdSetDepthBias(VkCommandBuffer commandBuffer, cmdbuf->state.fs_rsd = 0; } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdSetBlendConstants(VkCommandBuffer commandBuffer, const float blendConstants[4]) { @@ -303,14 +303,14 @@ panvk_CmdSetBlendConstants(VkCommandBuffer commandBuffer, cmdbuf->state.fs_rsd = 0; } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdSetDepthBounds(VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds) { panvk_stub(); } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdSetStencilCompareMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask) @@ -327,7 +327,7 @@ panvk_CmdSetStencilCompareMask(VkCommandBuffer commandBuffer, cmdbuf->state.fs_rsd = 0; } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdSetStencilWriteMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t writeMask) { @@ -343,7 +343,7 @@ panvk_CmdSetStencilWriteMask(VkCommandBuffer commandBuffer, cmdbuf->state.fs_rsd = 0; } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference) { @@ -359,7 +359,7 @@ panvk_CmdSetStencilReference(VkCommandBuffer commandBuffer, cmdbuf->state.fs_rsd = 0; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_CreateCommandPool(VkDevice _device, const VkCommandPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -492,7 +492,7 @@ panvk_cmd_fb_info_init(struct panvk_cmd_buffer *cmdbuf) }; } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdBeginRenderPass2(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, const VkSubpassBeginInfo *pSubpassBeginInfo) @@ -555,14 +555,14 @@ panvk_cmd_open_batch(struct panvk_cmd_buffer *cmdbuf) return cmdbuf->state.batch; } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) { panvk_stub(); } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) @@ -570,7 +570,7 @@ panvk_CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer _buffer, panvk_stub(); } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdDispatchBase(VkCommandBuffer commandBuffer, uint32_t base_x, uint32_t base_y, uint32_t base_z, uint32_t x, uint32_t y, uint32_t z) @@ -578,7 +578,7 @@ panvk_CmdDispatchBase(VkCommandBuffer commandBuffer, uint32_t base_x, panvk_stub(); } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset) { diff --git a/src/panfrost/vulkan/panvk_descriptor_set.c b/src/panfrost/vulkan/panvk_descriptor_set.c index cc65dae4e33..b1495ffa8cc 100644 --- a/src/panfrost/vulkan/panvk_descriptor_set.c +++ b/src/panfrost/vulkan/panvk_descriptor_set.c @@ -42,7 +42,7 @@ #define PANVK_MAX_SAMPLERS (1 << 16) #define PANVK_MAX_UBOS 255 -void +VKAPI_ATTR void VKAPI_CALL panvk_GetDescriptorSetLayoutSupport( VkDevice _device, const VkDescriptorSetLayoutCreateInfo *pCreateInfo, VkDescriptorSetLayoutSupport *pSupport) @@ -116,7 +116,7 @@ panvk_GetDescriptorSetLayoutSupport( * just multiple descriptor set layouts pasted together. */ -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_CreatePipelineLayout(VkDevice _device, const VkPipelineLayoutCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -203,7 +203,7 @@ panvk_CreatePipelineLayout(VkDevice _device, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_CreateDescriptorPool(VkDevice _device, const VkDescriptorPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -266,7 +266,7 @@ panvk_CreateDescriptorPool(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL panvk_DestroyDescriptorPool(VkDevice _device, VkDescriptorPool _pool, const VkAllocationCallbacks *pAllocator) { @@ -277,7 +277,7 @@ panvk_DestroyDescriptorPool(VkDevice _device, VkDescriptorPool _pool, vk_object_free(&device->vk, pAllocator, pool); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_ResetDescriptorPool(VkDevice _device, VkDescriptorPool _pool, VkDescriptorPoolResetFlags flags) { @@ -303,7 +303,7 @@ panvk_descriptor_set_destroy(struct panvk_device *device, vk_object_free(&device->vk, NULL, set); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_FreeDescriptorSets(VkDevice _device, VkDescriptorPool descriptorPool, uint32_t count, const VkDescriptorSet *pDescriptorSets) { @@ -319,7 +319,7 @@ panvk_FreeDescriptorSets(VkDevice _device, VkDescriptorPool descriptorPool, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_CreateSamplerYcbcrConversion( VkDevice device, const VkSamplerYcbcrConversionCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -329,7 +329,7 @@ panvk_CreateSamplerYcbcrConversion( return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL panvk_DestroySamplerYcbcrConversion(VkDevice device, VkSamplerYcbcrConversion ycbcrConversion, const VkAllocationCallbacks *pAllocator) diff --git a/src/panfrost/vulkan/panvk_device.c b/src/panfrost/vulkan/panvk_device.c index 0ecf13c74ed..d810212f165 100644 --- a/src/panfrost/vulkan/panvk_device.c +++ b/src/panfrost/vulkan/panvk_device.c @@ -132,7 +132,7 @@ static const struct debug_control panvk_debug_options[] = { #define PANVK_API_VERSION VK_MAKE_VERSION(1, 0, VK_HEADER_VERSION) -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_EnumerateInstanceVersion(uint32_t *pApiVersion) { *pApiVersion = PANVK_API_VERSION; @@ -341,7 +341,7 @@ panvk_kmod_free(const struct pan_kmod_allocator *allocator, void *data) return vk_free(vkalloc, data); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkInstance *pInstance) @@ -393,7 +393,7 @@ panvk_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL panvk_DestroyInstance(VkInstance _instance, const VkAllocationCallbacks *pAllocator) { @@ -572,7 +572,7 @@ panvk_physical_device_try_create(struct vk_instance *vk_instance, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL panvk_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) { @@ -778,7 +778,7 @@ static const VkQueueFamilyProperties panvk_queue_family_properties = { .minImageTransferGranularity = {1, 1, 1}, }; -void +VKAPI_ATTR void VKAPI_CALL panvk_GetPhysicalDeviceQueueFamilyProperties2( VkPhysicalDevice physicalDevice, uint32_t *pQueueFamilyPropertyCount, VkQueueFamilyProperties2 *pQueueFamilyProperties) @@ -812,7 +812,7 @@ panvk_get_system_heap_size() return available_ram; } -void +VKAPI_ATTR void VKAPI_CALL panvk_GetPhysicalDeviceMemoryProperties2( VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties2 *pMemoryProperties) @@ -975,7 +975,7 @@ panvk_priv_bo_destroy(struct panvk_priv_bo *priv_bo, /* Always reserve the lower 32MB. */ #define PANVK_VA_RESERVE_BOTTOM 0x2000000ull -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_CreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDevice *pDevice) @@ -1132,7 +1132,7 @@ fail: return result; } -void +VKAPI_ATTR void VKAPI_CALL panvk_DestroyDevice(VkDevice _device, const VkAllocationCallbacks *pAllocator) { VK_FROM_HANDLE(panvk_device, device, _device); @@ -1161,7 +1161,7 @@ panvk_DestroyDevice(VkDevice _device, const VkAllocationCallbacks *pAllocator) vk_free(&device->vk.alloc, device); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_EnumerateInstanceLayerProperties(uint32_t *pPropertyCount, VkLayerProperties *pProperties) { @@ -1169,7 +1169,7 @@ panvk_EnumerateInstanceLayerProperties(uint32_t *pPropertyCount, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_QueueWaitIdle(VkQueue _queue) { VK_FROM_HANDLE(panvk_queue, queue, _queue); @@ -1191,7 +1191,7 @@ panvk_QueueWaitIdle(VkQueue _queue) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_EnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) @@ -1221,7 +1221,7 @@ vk_icdGetInstanceProcAddr(VkInstance instance, const char *pName) return panvk_GetInstanceProcAddr(instance, pName); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_AllocateMemory(VkDevice _device, const VkMemoryAllocateInfo *pAllocateInfo, const VkAllocationCallbacks *pAllocator, @@ -1310,7 +1310,7 @@ panvk_AllocateMemory(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL panvk_FreeMemory(VkDevice _device, VkDeviceMemory _mem, const VkAllocationCallbacks *pAllocator) { @@ -1341,7 +1341,7 @@ panvk_FreeMemory(VkDevice _device, VkDeviceMemory _mem, vk_object_free(&device->vk, pAllocator, mem); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_MapMemory(VkDevice _device, VkDeviceMemory _memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void **ppData) { @@ -1367,7 +1367,7 @@ panvk_MapMemory(VkDevice _device, VkDeviceMemory _memory, VkDeviceSize offset, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL panvk_UnmapMemory(VkDevice _device, VkDeviceMemory _memory) { VK_FROM_HANDLE(panvk_device_memory, mem, _memory); @@ -1381,21 +1381,21 @@ panvk_UnmapMemory(VkDevice _device, VkDeviceMemory _memory) } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_FlushMappedMemoryRanges(VkDevice _device, uint32_t memoryRangeCount, const VkMappedMemoryRange *pMemoryRanges) { return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_InvalidateMappedMemoryRanges(VkDevice _device, uint32_t memoryRangeCount, const VkMappedMemoryRange *pMemoryRanges) { return VK_SUCCESS; } -VkDeviceAddress +VKAPI_ATTR VkDeviceAddress VKAPI_CALL panvk_GetBufferDeviceAddress(VkDevice _device, const VkBufferDeviceAddressInfo *pInfo) { @@ -1404,7 +1404,7 @@ panvk_GetBufferDeviceAddress(VkDevice _device, return buffer->dev_addr; } -void +VKAPI_ATTR void VKAPI_CALL panvk_GetBufferMemoryRequirements2(VkDevice device, const VkBufferMemoryRequirementsInfo2 *pInfo, VkMemoryRequirements2 *pMemoryRequirements) @@ -1419,7 +1419,7 @@ panvk_GetBufferMemoryRequirements2(VkDevice device, pMemoryRequirements->memoryRequirements.size = size; } -void +VKAPI_ATTR void VKAPI_CALL panvk_GetImageMemoryRequirements2(VkDevice device, const VkImageMemoryRequirementsInfo2 *pInfo, VkMemoryRequirements2 *pMemoryRequirements) @@ -1434,7 +1434,7 @@ panvk_GetImageMemoryRequirements2(VkDevice device, pMemoryRequirements->memoryRequirements.size = size; } -void +VKAPI_ATTR void VKAPI_CALL panvk_GetImageSparseMemoryRequirements2( VkDevice device, const VkImageSparseMemoryRequirementsInfo2 *pInfo, uint32_t *pSparseMemoryRequirementCount, @@ -1443,14 +1443,14 @@ panvk_GetImageSparseMemoryRequirements2( panvk_stub(); } -void +VKAPI_ATTR void VKAPI_CALL panvk_GetDeviceMemoryCommitment(VkDevice device, VkDeviceMemory memory, VkDeviceSize *pCommittedMemoryInBytes) { *pCommittedMemoryInBytes = 0; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_BindBufferMemory2(VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo *pBindInfos) { @@ -1489,7 +1489,7 @@ panvk_BindBufferMemory2(VkDevice device, uint32_t bindInfoCount, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_BindImageMemory2(VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo *pBindInfos) { @@ -1536,7 +1536,7 @@ panvk_BindImageMemory2(VkDevice device, uint32_t bindInfoCount, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_CreateEvent(VkDevice _device, const VkEventCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkEvent *pEvent) { @@ -1560,7 +1560,7 @@ panvk_CreateEvent(VkDevice _device, const VkEventCreateInfo *pCreateInfo, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL panvk_DestroyEvent(VkDevice _device, VkEvent _event, const VkAllocationCallbacks *pAllocator) { @@ -1576,7 +1576,7 @@ panvk_DestroyEvent(VkDevice _device, VkEvent _event, vk_object_free(&device->vk, pAllocator, event); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_GetEventStatus(VkDevice _device, VkEvent _event) { VK_FROM_HANDLE(panvk_device, device, _device); @@ -1604,7 +1604,7 @@ panvk_GetEventStatus(VkDevice _device, VkEvent _event) return signaled ? VK_EVENT_SET : VK_EVENT_RESET; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_SetEvent(VkDevice _device, VkEvent _event) { VK_FROM_HANDLE(panvk_device, device, _device); @@ -1626,7 +1626,7 @@ panvk_SetEvent(VkDevice _device, VkEvent _event) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_ResetEvent(VkDevice _device, VkEvent _event) { VK_FROM_HANDLE(panvk_device, device, _device); @@ -1642,7 +1642,7 @@ panvk_ResetEvent(VkDevice _device, VkEvent _event) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_CreateBuffer(VkDevice _device, const VkBufferCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkBuffer *pBuffer) { @@ -1661,7 +1661,7 @@ panvk_CreateBuffer(VkDevice _device, const VkBufferCreateInfo *pCreateInfo, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL panvk_DestroyBuffer(VkDevice _device, VkBuffer _buffer, const VkAllocationCallbacks *pAllocator) { @@ -1686,7 +1686,7 @@ panvk_DestroyBuffer(VkDevice _device, VkBuffer _buffer, vk_buffer_destroy(&device->vk, pAllocator, &buffer->vk); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_CreateFramebuffer(VkDevice _device, const VkFramebufferCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -1718,7 +1718,7 @@ panvk_CreateFramebuffer(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL panvk_DestroyFramebuffer(VkDevice _device, VkFramebuffer _fb, const VkAllocationCallbacks *pAllocator) { @@ -1729,7 +1729,7 @@ panvk_DestroyFramebuffer(VkDevice _device, VkFramebuffer _fb, vk_object_free(&device->vk, pAllocator, fb); } -void +VKAPI_ATTR void VKAPI_CALL panvk_DestroySampler(VkDevice _device, VkSampler _sampler, const VkAllocationCallbacks *pAllocator) { @@ -1742,7 +1742,7 @@ panvk_DestroySampler(VkDevice _device, VkSampler _sampler, vk_object_free(&device->vk, pAllocator, sampler); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_GetMemoryFdKHR(VkDevice _device, const VkMemoryGetFdInfoKHR *pGetFdInfo, int *pFd) { @@ -1764,7 +1764,7 @@ panvk_GetMemoryFdKHR(VkDevice _device, const VkMemoryGetFdInfoKHR *pGetFdInfo, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_GetMemoryFdPropertiesKHR(VkDevice _device, VkExternalMemoryHandleTypeFlagBits handleType, int fd, @@ -1775,7 +1775,7 @@ panvk_GetMemoryFdPropertiesKHR(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL panvk_GetPhysicalDeviceExternalSemaphoreProperties( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo, @@ -1801,7 +1801,7 @@ panvk_GetPhysicalDeviceExternalSemaphoreProperties( } } -void +VKAPI_ATTR void VKAPI_CALL panvk_GetPhysicalDeviceExternalFenceProperties( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo *pExternalFenceInfo, diff --git a/src/panfrost/vulkan/panvk_formats.c b/src/panfrost/vulkan/panvk_formats.c index 0c1e8283bc7..45d32d04f0b 100644 --- a/src/panfrost/vulkan/panvk_formats.c +++ b/src/panfrost/vulkan/panvk_formats.c @@ -99,7 +99,7 @@ end: out_properties->bufferFeatures = buffer; } -void +VKAPI_ATTR void VKAPI_CALL panvk_GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties *pFormatProperties) @@ -109,7 +109,7 @@ panvk_GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice, get_format_properties(physical_device, format, pFormatProperties); } -void +VKAPI_ATTR void VKAPI_CALL panvk_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties2 *pFormatProperties) @@ -274,7 +274,7 @@ unsupported: return VK_ERROR_FORMAT_NOT_SUPPORTED; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_GetPhysicalDeviceImageFormatProperties( VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkImageTiling tiling, VkImageUsageFlags usage, @@ -353,7 +353,7 @@ panvk_get_external_image_format_properties( return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_GetPhysicalDeviceImageFormatProperties2( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *base_info, @@ -455,7 +455,7 @@ fail: return result; } -void +VKAPI_ATTR void VKAPI_CALL panvk_GetPhysicalDeviceSparseImageFormatProperties( VkPhysicalDevice physicalDevice, VkFormat format, VkImageType type, VkSampleCountFlagBits samples, VkImageUsageFlags usage, VkImageTiling tiling, @@ -465,7 +465,7 @@ panvk_GetPhysicalDeviceSparseImageFormatProperties( *pNumProperties = 0; } -void +VKAPI_ATTR void VKAPI_CALL panvk_GetPhysicalDeviceSparseImageFormatProperties2( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2 *pFormatInfo, @@ -475,7 +475,7 @@ panvk_GetPhysicalDeviceSparseImageFormatProperties2( *pPropertyCount = 0; } -void +VKAPI_ATTR void VKAPI_CALL panvk_GetPhysicalDeviceExternalBufferProperties( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo, diff --git a/src/panfrost/vulkan/panvk_image.c b/src/panfrost/vulkan/panvk_image.c index a9aaad22c0e..04194c26dcf 100644 --- a/src/panfrost/vulkan/panvk_image.c +++ b/src/panfrost/vulkan/panvk_image.c @@ -193,7 +193,7 @@ panvk_image_select_mod(VkDevice _device, const VkImageCreateInfo *pCreateInfo, return DRM_FORMAT_MOD_ARM_AFBC(afbc_type); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_CreateImage(VkDevice device, const VkImageCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkImage *pImage) { @@ -205,7 +205,7 @@ panvk_CreateImage(VkDevice device, const VkImageCreateInfo *pCreateInfo, plane_layouts); } -void +VKAPI_ATTR void VKAPI_CALL panvk_DestroyImage(VkDevice _device, VkImage _image, const VkAllocationCallbacks *pAllocator) { @@ -236,7 +236,7 @@ panvk_plane_index(VkFormat format, VkImageAspectFlags aspect_mask) } } -void +VKAPI_ATTR void VKAPI_CALL panvk_GetImageSubresourceLayout(VkDevice _device, VkImage _image, const VkImageSubresource *pSubresource, VkSubresourceLayout *pLayout) @@ -258,7 +258,7 @@ panvk_GetImageSubresourceLayout(VkDevice _device, VkImage _image, pLayout->depthPitch = slice_layout->surface_stride; } -void +VKAPI_ATTR void VKAPI_CALL panvk_DestroyImageView(VkDevice _device, VkImageView _view, const VkAllocationCallbacks *pAllocator) { @@ -272,7 +272,7 @@ panvk_DestroyImageView(VkDevice _device, VkImageView _view, vk_image_view_destroy(&device->vk, pAllocator, &view->vk); } -void +VKAPI_ATTR void VKAPI_CALL panvk_DestroyBufferView(VkDevice _device, VkBufferView bufferView, const VkAllocationCallbacks *pAllocator) { @@ -286,7 +286,7 @@ panvk_DestroyBufferView(VkDevice _device, VkBufferView bufferView, vk_object_free(&device->vk, pAllocator, view); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_GetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage _image, VkImageDrmFormatModifierPropertiesEXT *pProperties) diff --git a/src/panfrost/vulkan/panvk_pass.c b/src/panfrost/vulkan/panvk_pass.c index 1abe6c63b3f..d9f24de1239 100644 --- a/src/panfrost/vulkan/panvk_pass.c +++ b/src/panfrost/vulkan/panvk_pass.c @@ -30,7 +30,7 @@ #include "vk_format.h" #include "vk_util.h" -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_CreateRenderPass2(VkDevice _device, const VkRenderPassCreateInfo2 *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -201,7 +201,7 @@ panvk_CreateRenderPass2(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL panvk_DestroyRenderPass(VkDevice _device, VkRenderPass _pass, const VkAllocationCallbacks *pAllocator) { @@ -215,7 +215,7 @@ panvk_DestroyRenderPass(VkDevice _device, VkRenderPass _pass, vk_object_free(&device->vk, pAllocator, pass); } -void +VKAPI_ATTR void VKAPI_CALL panvk_GetRenderAreaGranularity(VkDevice _device, VkRenderPass renderPass, VkExtent2D *pGranularity) { diff --git a/src/panfrost/vulkan/panvk_pipeline.c b/src/panfrost/vulkan/panvk_pipeline.c index 2adf321dca2..07a6ebd05c5 100644 --- a/src/panfrost/vulkan/panvk_pipeline.c +++ b/src/panfrost/vulkan/panvk_pipeline.c @@ -38,7 +38,7 @@ #include "vk_format.h" #include "vk_util.h" -void +VKAPI_ATTR void VKAPI_CALL panvk_DestroyPipeline(VkDevice _device, VkPipeline _pipeline, const VkAllocationCallbacks *pAllocator) { diff --git a/src/panfrost/vulkan/panvk_query.c b/src/panfrost/vulkan/panvk_query.c index b55a2c312fa..244648b4b18 100644 --- a/src/panfrost/vulkan/panvk_query.c +++ b/src/panfrost/vulkan/panvk_query.c @@ -23,7 +23,7 @@ #include "panvk_private.h" -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_CreateQueryPool(VkDevice _device, const VkQueryPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -33,14 +33,14 @@ panvk_CreateQueryPool(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL panvk_DestroyQueryPool(VkDevice _device, VkQueryPool _pool, const VkAllocationCallbacks *pAllocator) { panvk_stub(); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_GetQueryPoolResults(VkDevice _device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, size_t dataSize, void *pData, VkDeviceSize stride, @@ -50,7 +50,7 @@ panvk_GetQueryPoolResults(VkDevice _device, VkQueryPool queryPool, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdCopyQueryPoolResults(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, VkBuffer dstBuffer, @@ -60,28 +60,28 @@ panvk_CmdCopyQueryPoolResults(VkCommandBuffer commandBuffer, panvk_stub(); } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdResetQueryPool(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount) { panvk_stub(); } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdBeginQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags) { panvk_stub(); } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query) { panvk_stub(); } -void +VKAPI_ATTR void VKAPI_CALL panvk_CmdWriteTimestamp2(VkCommandBuffer commandBuffer, VkPipelineStageFlags2 stage, VkQueryPool queryPool, uint32_t query) diff --git a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c index a545862cf67..b3e19e5ff0e 100644 --- a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c +++ b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c @@ -156,7 +156,7 @@ panvk_per_arch(cmd_close_batch)(struct panvk_cmd_buffer *cmdbuf) cmdbuf->state.batch = NULL; } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdNextSubpass2)(VkCommandBuffer commandBuffer, const VkSubpassBeginInfo *pSubpassBeginInfo, const VkSubpassEndInfo *pSubpassEndInfo) @@ -170,7 +170,7 @@ panvk_per_arch(CmdNextSubpass2)(VkCommandBuffer commandBuffer, panvk_cmd_open_batch(cmdbuf); } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdNextSubpass)(VkCommandBuffer cmd, VkSubpassContents contents) { VkSubpassBeginInfo binfo = {.sType = VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO, @@ -779,7 +779,7 @@ panvk_cmd_draw(struct panvk_cmd_buffer *cmdbuf, struct panvk_draw_info *draw) desc_state->dirty = cmdbuf->state.dirty = 0; } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdDraw)(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) @@ -852,7 +852,7 @@ panvk_index_minmax_search(struct panvk_cmd_buffer *cmdbuf, uint32_t start, } } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdDrawIndexed)(VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, @@ -893,7 +893,7 @@ panvk_per_arch(CmdDrawIndexed)(VkCommandBuffer commandBuffer, panvk_cmd_draw(cmdbuf, &draw); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_per_arch(EndCommandBuffer)(VkCommandBuffer commandBuffer) { VK_FROM_HANDLE(panvk_cmd_buffer, cmdbuf, commandBuffer); @@ -903,7 +903,7 @@ panvk_per_arch(EndCommandBuffer)(VkCommandBuffer commandBuffer) return vk_command_buffer_end(&cmdbuf->vk); } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdEndRenderPass2)(VkCommandBuffer commandBuffer, const VkSubpassEndInfo *pSubpassEndInfo) { @@ -918,7 +918,7 @@ panvk_per_arch(CmdEndRenderPass2)(VkCommandBuffer commandBuffer, cmdbuf->state.clear = NULL; } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdEndRenderPass)(VkCommandBuffer cmd) { VkSubpassEndInfo einfo = { @@ -928,7 +928,7 @@ panvk_per_arch(CmdEndRenderPass)(VkCommandBuffer cmd) panvk_per_arch(CmdEndRenderPass2)(cmd, &einfo); } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdPipelineBarrier2)(VkCommandBuffer commandBuffer, const VkDependencyInfo *pDependencyInfo) { @@ -1006,7 +1006,7 @@ panvk_add_wait_event_operation(struct panvk_cmd_buffer *cmdbuf, } } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdSetEvent2)(VkCommandBuffer commandBuffer, VkEvent _event, const VkDependencyInfo *pDependencyInfo) { @@ -1019,7 +1019,7 @@ panvk_per_arch(CmdSetEvent2)(VkCommandBuffer commandBuffer, VkEvent _event, panvk_add_set_event_operation(cmdbuf, event, PANVK_EVENT_OP_SET); } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdResetEvent2)(VkCommandBuffer commandBuffer, VkEvent _event, VkPipelineStageFlags2 stageMask) { @@ -1032,7 +1032,7 @@ panvk_per_arch(CmdResetEvent2)(VkCommandBuffer commandBuffer, VkEvent _event, panvk_add_set_event_operation(cmdbuf, event, PANVK_EVENT_OP_RESET); } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdWaitEvents2)(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent *pEvents, const VkDependencyInfo *pDependencyInfos) @@ -1140,7 +1140,7 @@ const struct vk_command_buffer_ops panvk_per_arch(cmd_buffer_ops) = { .destroy = panvk_destroy_cmdbuf, }; -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_per_arch(BeginCommandBuffer)(VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo *pBeginInfo) { @@ -1153,7 +1153,7 @@ panvk_per_arch(BeginCommandBuffer)(VkCommandBuffer commandBuffer, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(DestroyCommandPool)(VkDevice _device, VkCommandPool commandPool, const VkAllocationCallbacks *pAllocator) { @@ -1169,7 +1169,7 @@ panvk_per_arch(DestroyCommandPool)(VkDevice _device, VkCommandPool commandPool, vk_free2(&device->vk.alloc, pAllocator, pool); } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdDispatch)(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z) { diff --git a/src/panfrost/vulkan/panvk_vX_descriptor_set.c b/src/panfrost/vulkan/panvk_vX_descriptor_set.c index e2471d08991..4a71adcb74c 100644 --- a/src/panfrost/vulkan/panvk_vX_descriptor_set.c +++ b/src/panfrost/vulkan/panvk_vX_descriptor_set.c @@ -80,7 +80,7 @@ panvk_fill_image_desc(struct panvk_image_desc *desc, desc->depth = view->vk.layer_count - 1; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_per_arch(CreateDescriptorSetLayout)( VkDevice _device, const VkDescriptorSetLayoutCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDescriptorSetLayout *pSetLayout) @@ -341,7 +341,7 @@ err_free_set: return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_per_arch(AllocateDescriptorSets)( VkDevice _device, const VkDescriptorSetAllocateInfo *pAllocateInfo, VkDescriptorSet *pDescriptorSets) @@ -683,7 +683,7 @@ panvk_copy_dyn_ssbo_desc(struct panvk_descriptor_set *dst_set, *panvk_dyn_ssbo_desc(src_set, src_binding, src_elem); } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(UpdateDescriptorSets)( VkDevice _device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet *pDescriptorWrites, uint32_t descriptorCopyCount, @@ -886,7 +886,7 @@ panvk_per_arch(UpdateDescriptorSets)( } } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(UpdateDescriptorSetWithTemplate)( VkDevice _device, VkDescriptorSet descriptorSet, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const void *data) diff --git a/src/panfrost/vulkan/panvk_vX_device.c b/src/panfrost/vulkan/panvk_vX_device.c index ccca69e3a50..6ae8d6f2eb3 100644 --- a/src/panfrost/vulkan/panvk_vX_device.c +++ b/src/panfrost/vulkan/panvk_vX_device.c @@ -304,7 +304,7 @@ panvk_per_arch(queue_submit)(struct vk_queue *vk_queue, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_per_arch(CreateSampler)(VkDevice _device, const VkSamplerCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, diff --git a/src/panfrost/vulkan/panvk_vX_image.c b/src/panfrost/vulkan/panvk_vX_image.c index 8b13f89a484..952dc8d336b 100644 --- a/src/panfrost/vulkan/panvk_vX_image.c +++ b/src/panfrost/vulkan/panvk_vX_image.c @@ -86,7 +86,7 @@ panvk_convert_swizzle(const VkComponentMapping *in, unsigned char *out) } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_per_arch(CreateImageView)(VkDevice _device, const VkImageViewCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -172,7 +172,7 @@ panvk_per_arch(CreateImageView)(VkDevice _device, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_per_arch(CreateBufferView)(VkDevice _device, const VkBufferViewCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, diff --git a/src/panfrost/vulkan/panvk_vX_meta_blit.c b/src/panfrost/vulkan/panvk_vX_meta_blit.c index 2cedd6359c7..34c775393ac 100644 --- a/src/panfrost/vulkan/panvk_vX_meta_blit.c +++ b/src/panfrost/vulkan/panvk_vX_meta_blit.c @@ -143,7 +143,7 @@ panvk_meta_blit(struct panvk_cmd_buffer *cmdbuf, } while (pan_blit_next_surface(&ctx)); } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdBlitImage2)(VkCommandBuffer commandBuffer, const VkBlitImageInfo2 *pBlitImageInfo) { @@ -217,7 +217,7 @@ panvk_per_arch(CmdBlitImage2)(VkCommandBuffer commandBuffer, } } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdResolveImage2)(VkCommandBuffer commandBuffer, const VkResolveImageInfo2 *pResolveImageInfo) { diff --git a/src/panfrost/vulkan/panvk_vX_meta_clear.c b/src/panfrost/vulkan/panvk_vX_meta_clear.c index 43a6c5da30d..a8238402c62 100644 --- a/src/panfrost/vulkan/panvk_vX_meta_clear.c +++ b/src/panfrost/vulkan/panvk_vX_meta_clear.c @@ -367,7 +367,7 @@ panvk_meta_clear_color_img(struct panvk_cmd_buffer *cmdbuf, } } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdClearColorImage)(VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearColorValue *pColor, @@ -446,7 +446,7 @@ panvk_meta_clear_zs_img(struct panvk_cmd_buffer *cmdbuf, memset(fbinfo, 0, sizeof(*fbinfo)); } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdClearDepthStencilImage)( VkCommandBuffer commandBuffer, VkImage image, VkImageLayout imageLayout, const VkClearDepthStencilValue *pDepthStencil, uint32_t rangeCount, @@ -461,7 +461,7 @@ panvk_per_arch(CmdClearDepthStencilImage)( panvk_meta_clear_zs_img(cmdbuf, img, pDepthStencil, &pRanges[i]); } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdClearAttachments)(VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment *pAttachments, diff --git a/src/panfrost/vulkan/panvk_vX_meta_copy.c b/src/panfrost/vulkan/panvk_vX_meta_copy.c index cd2365dd529..2be600f343e 100644 --- a/src/panfrost/vulkan/panvk_vX_meta_copy.c +++ b/src/panfrost/vulkan/panvk_vX_meta_copy.c @@ -735,7 +735,7 @@ panvk_meta_copy_img2img_init(struct panvk_device *dev, bool is_ms) } } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdCopyImage2)(VkCommandBuffer commandBuffer, const VkCopyImageInfo2 *pCopyImageInfo) { @@ -1142,7 +1142,7 @@ panvk_meta_copy_buf2img_init(struct panvk_device *dev) } } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdCopyBufferToImage2)( VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2 *pCopyBufferToImageInfo) @@ -1583,7 +1583,7 @@ panvk_meta_copy_img2buf_init(struct panvk_device *dev) } } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdCopyImageToBuffer2)( VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2 *pCopyImageToBufferInfo) @@ -1716,7 +1716,7 @@ panvk_meta_copy_buf2buf(struct panvk_cmd_buffer *cmdbuf, panvk_per_arch(cmd_close_batch)(cmdbuf); } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdCopyBuffer2)(VkCommandBuffer commandBuffer, const VkCopyBufferInfo2 *pCopyBufferInfo) { @@ -1860,7 +1860,7 @@ panvk_meta_fill_buf(struct panvk_cmd_buffer *cmdbuf, panvk_per_arch(cmd_close_batch)(cmdbuf); } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdFillBuffer)(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize fillSize, uint32_t data) @@ -1909,7 +1909,7 @@ panvk_meta_update_buf(struct panvk_cmd_buffer *cmdbuf, panvk_per_arch(cmd_close_batch)(cmdbuf); } -void +VKAPI_ATTR void VKAPI_CALL panvk_per_arch(CmdUpdateBuffer)(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void *pData) diff --git a/src/panfrost/vulkan/panvk_vX_pipeline.c b/src/panfrost/vulkan/panvk_vX_pipeline.c index 99e7fbb1020..a5ccbf7a260 100644 --- a/src/panfrost/vulkan/panvk_vX_pipeline.c +++ b/src/panfrost/vulkan/panvk_vX_pipeline.c @@ -893,7 +893,7 @@ panvk_pipeline_builder_init_graphics( } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_per_arch(CreateGraphicsPipelines)( VkDevice device, VkPipelineCache pipelineCache, uint32_t count, const VkGraphicsPipelineCreateInfo *pCreateInfos, @@ -944,7 +944,7 @@ panvk_pipeline_builder_init_compute( }; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL panvk_per_arch(CreateComputePipelines)( VkDevice device, VkPipelineCache pipelineCache, uint32_t count, const VkComputePipelineCreateInfo *pCreateInfos,