From 0aaaee09a4b1a4f688cca57f766f3d81c8adbc81 Mon Sep 17 00:00:00 2001 From: James Park Date: Wed, 10 Nov 2021 23:25:47 -0800 Subject: [PATCH] radv: Match function definitions to declarations Fixes compiler errors for 32-bit Windows. Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/layers/radv_sqtt_layer.c | 106 ++++++------- src/amd/vulkan/radv_acceleration_structure.c | 28 ++-- src/amd/vulkan/radv_cmd_buffer.c | 157 ++++++++++--------- src/amd/vulkan/radv_descriptor_set.c | 32 ++-- src/amd/vulkan/radv_device.c | 146 ++++++++--------- src/amd/vulkan/radv_formats.c | 12 +- src/amd/vulkan/radv_image.c | 16 +- src/amd/vulkan/radv_meta.c | 6 +- src/amd/vulkan/radv_meta_blit.c | 2 +- src/amd/vulkan/radv_meta_buffer.c | 6 +- src/amd/vulkan/radv_meta_clear.c | 6 +- src/amd/vulkan/radv_meta_copy.c | 6 +- src/amd/vulkan/radv_meta_resolve.c | 2 +- src/amd/vulkan/radv_pass.c | 6 +- src/amd/vulkan/radv_pipeline.c | 12 +- src/amd/vulkan/radv_pipeline_cache.c | 8 +- src/amd/vulkan/radv_pipeline_rt.c | 6 +- src/amd/vulkan/radv_query.c | 24 +-- src/amd/vulkan/radv_shader.c | 2 +- src/amd/vulkan/radv_wsi.c | 6 +- 20 files changed, 295 insertions(+), 294 deletions(-) diff --git a/src/amd/vulkan/layers/radv_sqtt_layer.c b/src/amd/vulkan/layers/radv_sqtt_layer.c index 5c8cda63809..a040344df19 100644 --- a/src/amd/vulkan/layers/radv_sqtt_layer.c +++ b/src/amd/vulkan/layers/radv_sqtt_layer.c @@ -397,7 +397,7 @@ radv_handle_thread_trace(VkQueue _queue) num_frames++; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL sqtt_QueuePresentKHR(VkQueue _queue, const VkPresentInfoKHR *pPresentInfo) { VkResult result; @@ -421,14 +421,14 @@ sqtt_QueuePresentKHR(VkQueue _queue, const VkPresentInfoKHR *pPresentInfo) #define EVENT_MARKER(cmd_name, ...) EVENT_MARKER_ALIAS(cmd_name, cmd_name, __VA_ARGS__); -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) { EVENT_MARKER(Draw, commandBuffer, vertexCount, instanceCount, firstVertex, firstInstance); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdDrawIndexed(VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance) { @@ -436,21 +436,21 @@ sqtt_CmdDrawIndexed(VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t firstInstance); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) { EVENT_MARKER(DrawIndirect, commandBuffer, buffer, offset, drawCount, stride); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) { EVENT_MARKER(DrawIndexedIndirect, commandBuffer, buffer, offset, drawCount, stride); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdDrawIndirectCount(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) @@ -459,7 +459,7 @@ sqtt_CmdDrawIndirectCount(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDevi maxDrawCount, stride); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdDrawIndexedIndirectCount(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkBuffer countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, @@ -469,45 +469,45 @@ sqtt_CmdDrawIndexedIndirectCount(VkCommandBuffer commandBuffer, VkBuffer buffer, countBufferOffset, maxDrawCount, stride); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdDispatch(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z) { EVENT_MARKER(Dispatch, commandBuffer, x, y, z); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset) { EVENT_MARKER(DispatchIndirect, commandBuffer, buffer, offset); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdCopyBuffer2KHR(VkCommandBuffer commandBuffer, const VkCopyBufferInfo2KHR *pCopyBufferInfo) { EVENT_MARKER_ALIAS(CopyBuffer2KHR, CopyBuffer, commandBuffer, pCopyBufferInfo); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize fillSize, uint32_t data) { EVENT_MARKER(FillBuffer, commandBuffer, dstBuffer, dstOffset, fillSize, data); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void *pData) { EVENT_MARKER(UpdateBuffer, commandBuffer, dstBuffer, dstOffset, dataSize, pData); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdCopyImage2KHR(VkCommandBuffer commandBuffer, const VkCopyImageInfo2KHR *pCopyImageInfo) { EVENT_MARKER_ALIAS(CopyImage2KHR, CopyImage, commandBuffer, pCopyImageInfo); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdCopyBufferToImage2KHR(VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2KHR *pCopyBufferToImageInfo) { @@ -515,7 +515,7 @@ sqtt_CmdCopyBufferToImage2KHR(VkCommandBuffer commandBuffer, pCopyBufferToImageInfo); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdCopyImageToBuffer2KHR(VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2KHR *pCopyImageToBufferInfo) { @@ -523,13 +523,13 @@ sqtt_CmdCopyImageToBuffer2KHR(VkCommandBuffer commandBuffer, pCopyImageToBufferInfo); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdBlitImage2KHR(VkCommandBuffer commandBuffer, const VkBlitImageInfo2KHR *pBlitImageInfo) { EVENT_MARKER_ALIAS(BlitImage2KHR, BlitImage, commandBuffer, pBlitImageInfo); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdClearColorImage(VkCommandBuffer commandBuffer, VkImage image_h, VkImageLayout imageLayout, const VkClearColorValue *pColor, uint32_t rangeCount, const VkImageSubresourceRange *pRanges) @@ -537,7 +537,7 @@ sqtt_CmdClearColorImage(VkCommandBuffer commandBuffer, VkImage image_h, VkImageL EVENT_MARKER(ClearColorImage, commandBuffer, image_h, imageLayout, pColor, rangeCount, pRanges); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdClearDepthStencilImage(VkCommandBuffer commandBuffer, VkImage image_h, VkImageLayout imageLayout, const VkClearDepthStencilValue *pDepthStencil, uint32_t rangeCount, @@ -547,7 +547,7 @@ sqtt_CmdClearDepthStencilImage(VkCommandBuffer commandBuffer, VkImage image_h, rangeCount, pRanges); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdClearAttachments(VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment *pAttachments, uint32_t rectCount, const VkClearRect *pRects) @@ -555,14 +555,14 @@ sqtt_CmdClearAttachments(VkCommandBuffer commandBuffer, uint32_t attachmentCount EVENT_MARKER(ClearAttachments, commandBuffer, attachmentCount, pAttachments, rectCount, pRects); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdResolveImage2KHR(VkCommandBuffer commandBuffer, const VkResolveImageInfo2KHR *pResolveImageInfo) { EVENT_MARKER_ALIAS(ResolveImage2KHR, ResolveImage, commandBuffer, pResolveImageInfo); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdWaitEvents(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent *pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const VkMemoryBarrier *pMemoryBarriers, @@ -576,7 +576,7 @@ sqtt_CmdWaitEvents(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkE pBufferMemoryBarriers, imageMemoryBarrierCount, pImageMemoryBarriers); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdPipelineBarrier(VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags destStageMask, VkBool32 byRegion, uint32_t memoryBarrierCount, const VkMemoryBarrier *pMemoryBarriers, @@ -590,14 +590,14 @@ sqtt_CmdPipelineBarrier(VkCommandBuffer commandBuffer, VkPipelineStageFlags srcS pBufferMemoryBarriers, imageMemoryBarrierCount, pImageMemoryBarriers); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdResetQueryPool(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount) { EVENT_MARKER(ResetQueryPool, commandBuffer, queryPool, firstQuery, queryCount); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdCopyQueryPoolResults(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags) @@ -615,7 +615,7 @@ sqtt_CmdCopyQueryPoolResults(VkCommandBuffer commandBuffer, VkQueryPool queryPoo #define API_MARKER(cmd_name, ...) API_MARKER_ALIAS(cmd_name, cmd_name, __VA_ARGS__); -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline _pipeline) { @@ -627,7 +627,7 @@ sqtt_CmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipeline radv_describe_pipeline_bind(cmd_buffer, pipelineBindPoint, pipeline); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdBindDescriptorSets(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet *pDescriptorSets, uint32_t dynamicOffsetCount, @@ -637,14 +637,14 @@ sqtt_CmdBindDescriptorSets(VkCommandBuffer commandBuffer, VkPipelineBindPoint pi descriptorSetCount, pDescriptorSets, dynamicOffsetCount, pDynamicOffsets); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdBindIndexBuffer(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) { API_MARKER(BindIndexBuffer, commandBuffer, buffer, offset, indexType); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdBindVertexBuffers(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets) @@ -652,27 +652,27 @@ sqtt_CmdBindVertexBuffers(VkCommandBuffer commandBuffer, uint32_t firstBinding, API_MARKER(BindVertexBuffers, commandBuffer, firstBinding, bindingCount, pBuffers, pOffsets); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdBeginQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags) { API_MARKER(BeginQuery, commandBuffer, queryPool, query, flags); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query) { API_MARKER(EndQuery, commandBuffer, queryPool, query); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdWriteTimestamp(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t flags) { API_MARKER(WriteTimestamp, commandBuffer, pipelineStage, queryPool, flags); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void *pValues) @@ -680,7 +680,7 @@ sqtt_CmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, API_MARKER(PushConstants, commandBuffer, layout, stageFlags, offset, size, pValues); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdBeginRenderPass2(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBeginInfo, const VkSubpassBeginInfo *pSubpassBeginInfo) @@ -689,47 +689,47 @@ sqtt_CmdBeginRenderPass2(VkCommandBuffer commandBuffer, pSubpassBeginInfo); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdNextSubpass2(VkCommandBuffer commandBuffer, const VkSubpassBeginInfo *pSubpassBeginInfo, const VkSubpassEndInfo *pSubpassEndInfo) { API_MARKER_ALIAS(NextSubpass2, NextSubpass, commandBuffer, pSubpassBeginInfo, pSubpassEndInfo); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdEndRenderPass2(VkCommandBuffer commandBuffer, const VkSubpassEndInfo *pSubpassEndInfo) { API_MARKER_ALIAS(EndRenderPass2, EndRenderPass, commandBuffer, pSubpassEndInfo); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer *pCmdBuffers) { API_MARKER(ExecuteCommands, commandBuffer, commandBufferCount, pCmdBuffers); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdSetViewport(VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewport *pViewports) { API_MARKER(SetViewport, commandBuffer, firstViewport, viewportCount, pViewports); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdSetScissor(VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_t scissorCount, const VkRect2D *pScissors) { API_MARKER(SetScissor, commandBuffer, firstScissor, scissorCount, pScissors); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) { API_MARKER(SetLineWidth, commandBuffer, lineWidth); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdSetDepthBias(VkCommandBuffer commandBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor) { @@ -737,33 +737,33 @@ sqtt_CmdSetDepthBias(VkCommandBuffer commandBuffer, float depthBiasConstantFacto depthBiasSlopeFactor); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdSetBlendConstants(VkCommandBuffer commandBuffer, const float blendConstants[4]) { API_MARKER(SetBlendConstants, commandBuffer, blendConstants); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdSetDepthBounds(VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds) { API_MARKER(SetDepthBounds, commandBuffer, minDepthBounds, maxDepthBounds); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdSetStencilCompareMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask) { API_MARKER(SetStencilCompareMask, commandBuffer, faceMask, compareMask); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdSetStencilWriteMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t writeMask) { API_MARKER(SetStencilWriteMask, commandBuffer, faceMask, writeMask); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference) { @@ -771,7 +771,7 @@ sqtt_CmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFaceFlags fa } /* VK_EXT_debug_marker */ -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdDebugMarkerBeginEXT(VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT *pMarkerInfo) { @@ -779,14 +779,14 @@ sqtt_CmdDebugMarkerBeginEXT(VkCommandBuffer commandBuffer, radv_write_user_event_marker(cmd_buffer, UserEventPush, pMarkerInfo->pMarkerName); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdDebugMarkerEndEXT(VkCommandBuffer commandBuffer) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); radv_write_user_event_marker(cmd_buffer, UserEventPop, NULL); } -void +VKAPI_ATTR void VKAPI_CALL sqtt_CmdDebugMarkerInsertEXT(VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT *pMarkerInfo) { @@ -794,14 +794,14 @@ sqtt_CmdDebugMarkerInsertEXT(VkCommandBuffer commandBuffer, radv_write_user_event_marker(cmd_buffer, UserEventTrigger, pMarkerInfo->pMarkerName); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL sqtt_DebugMarkerSetObjectNameEXT(VkDevice device, const VkDebugMarkerObjectNameInfoEXT *pNameInfo) { /* no-op */ return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL sqtt_DebugMarkerSetObjectTagEXT(VkDevice device, const VkDebugMarkerObjectTagInfoEXT *pTagInfo) { /* no-op */ @@ -994,7 +994,7 @@ radv_unregister_pipeline(struct radv_device *device, struct radv_pipeline *pipel simple_mtx_unlock(&code_object->lock); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL sqtt_CreateGraphicsPipelines(VkDevice _device, VkPipelineCache pipelineCache, uint32_t count, const VkGraphicsPipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) @@ -1030,7 +1030,7 @@ fail: return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL sqtt_CreateComputePipelines(VkDevice _device, VkPipelineCache pipelineCache, uint32_t count, const VkComputePipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) @@ -1066,7 +1066,7 @@ fail: return result; } -void +VKAPI_ATTR void VKAPI_CALL sqtt_DestroyPipeline(VkDevice _device, VkPipeline _pipeline, const VkAllocationCallbacks *pAllocator) { diff --git a/src/amd/vulkan/radv_acceleration_structure.c b/src/amd/vulkan/radv_acceleration_structure.c index d4382886383..e9d727ec20b 100644 --- a/src/amd/vulkan/radv_acceleration_structure.c +++ b/src/amd/vulkan/radv_acceleration_structure.c @@ -29,7 +29,7 @@ #include "radv_cs.h" #include "radv_meta.h" -void +VKAPI_ATTR void VKAPI_CALL radv_GetAccelerationStructureBuildSizesKHR( VkDevice _device, VkAccelerationStructureBuildTypeKHR buildType, const VkAccelerationStructureBuildGeometryInfoKHR *pBuildInfo, @@ -84,7 +84,7 @@ radv_GetAccelerationStructureBuildSizesKHR( MAX2(4096, 2 * (boxes + instances + triangles) * sizeof(uint32_t)); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateAccelerationStructureKHR(VkDevice _device, const VkAccelerationStructureCreateInfoKHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -109,7 +109,7 @@ radv_CreateAccelerationStructureKHR(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyAccelerationStructureKHR(VkDevice _device, VkAccelerationStructureKHR accelerationStructure, const VkAllocationCallbacks *pAllocator) @@ -124,7 +124,7 @@ radv_DestroyAccelerationStructureKHR(VkDevice _device, vk_free2(&device->vk.alloc, pAllocator, accel); } -VkDeviceAddress +VKAPI_ATTR VkDeviceAddress VKAPI_CALL radv_GetAccelerationStructureDeviceAddressKHR( VkDevice _device, const VkAccelerationStructureDeviceAddressInfoKHR *pInfo) { @@ -132,7 +132,7 @@ radv_GetAccelerationStructureDeviceAddressKHR( return radv_accel_struct_get_va(accel); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_WriteAccelerationStructuresPropertiesKHR( VkDevice _device, uint32_t accelerationStructureCount, const VkAccelerationStructureKHR *pAccelerationStructures, VkQueryType queryType, @@ -658,7 +658,7 @@ fail: return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_BuildAccelerationStructuresKHR( VkDevice _device, VkDeferredOperationKHR deferredOperation, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR *pInfos, @@ -675,7 +675,7 @@ radv_BuildAccelerationStructuresKHR( return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CopyAccelerationStructureKHR(VkDevice _device, VkDeferredOperationKHR deferredOperation, const VkCopyAccelerationStructureInfoKHR *pInfo) { @@ -1769,7 +1769,7 @@ struct bvh_state { uint32_t instance_count; }; -void +VKAPI_ATTR void VKAPI_CALL radv_CmdBuildAccelerationStructuresKHR( VkCommandBuffer commandBuffer, uint32_t infoCount, const VkAccelerationStructureBuildGeometryInfoKHR *pInfos, @@ -1932,7 +1932,7 @@ radv_CmdBuildAccelerationStructuresKHR( radv_meta_restore(&saved_state, cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdCopyAccelerationStructureKHR(VkCommandBuffer commandBuffer, const VkCopyAccelerationStructureInfoKHR *pInfo) { @@ -1966,7 +1966,7 @@ radv_CmdCopyAccelerationStructureKHR(VkCommandBuffer commandBuffer, radv_meta_restore(&saved_state, cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_GetDeviceAccelerationStructureCompatibilityKHR( VkDevice _device, const VkAccelerationStructureVersionInfoKHR *pVersionInfo, VkAccelerationStructureCompatibilityKHR *pCompatibility) @@ -1982,7 +1982,7 @@ radv_GetDeviceAccelerationStructureCompatibilityKHR( : VK_ACCELERATION_STRUCTURE_COMPATIBILITY_INCOMPATIBLE_KHR; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CopyMemoryToAccelerationStructureKHR(VkDevice _device, VkDeferredOperationKHR deferredOperation, const VkCopyMemoryToAccelerationStructureInfoKHR *pInfo) @@ -2012,7 +2012,7 @@ radv_CopyMemoryToAccelerationStructureKHR(VkDevice _device, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CopyAccelerationStructureToMemoryKHR(VkDevice _device, VkDeferredOperationKHR deferredOperation, const VkCopyAccelerationStructureToMemoryInfoKHR *pInfo) @@ -2049,7 +2049,7 @@ radv_CopyAccelerationStructureToMemoryKHR(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdCopyMemoryToAccelerationStructureKHR( VkCommandBuffer commandBuffer, const VkCopyMemoryToAccelerationStructureInfoKHR *pInfo) { @@ -2080,7 +2080,7 @@ radv_CmdCopyMemoryToAccelerationStructureKHR( radv_meta_restore(&saved_state, cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdCopyAccelerationStructureToMemoryKHR( VkCommandBuffer commandBuffer, const VkCopyAccelerationStructureToMemoryInfoKHR *pInfo) { diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 946b58aabc0..07368237013 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -4265,7 +4265,7 @@ radv_cmd_state_setup_attachments(struct radv_cmd_buffer *cmd_buffer, struct radv return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_AllocateCommandBuffers(VkDevice _device, const VkCommandBufferAllocateInfo *pAllocateInfo, VkCommandBuffer *pCommandBuffers) { @@ -4318,7 +4318,7 @@ radv_AllocateCommandBuffers(VkDevice _device, const VkCommandBufferAllocateInfo return result; } -void +VKAPI_ATTR void VKAPI_CALL radv_FreeCommandBuffers(VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers) { @@ -4335,14 +4335,14 @@ radv_FreeCommandBuffers(VkDevice device, VkCommandPool commandPool, uint32_t com } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_ResetCommandBuffer(VkCommandBuffer commandBuffer, VkCommandBufferResetFlags flags) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); return radv_reset_cmd_buffer(cmd_buffer); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_BeginCommandBuffer(VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo *pBeginInfo) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -4405,7 +4405,7 @@ radv_BeginCommandBuffer(VkCommandBuffer commandBuffer, const VkCommandBufferBegi return result; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdBindVertexBuffers(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets) @@ -4414,7 +4414,7 @@ radv_CmdBindVertexBuffers(VkCommandBuffer commandBuffer, uint32_t firstBinding, NULL, NULL); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdBindVertexBuffers2EXT(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets, const VkDeviceSize *pSizes, @@ -4513,7 +4513,7 @@ radv_get_vgt_index_size(uint32_t type) } } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdBindIndexBuffer(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, VkIndexType indexType) { @@ -4559,7 +4559,7 @@ radv_bind_descriptor_set(struct radv_cmd_buffer *cmd_buffer, VkPipelineBindPoint radv_cs_add_buffer(ws, cmd_buffer->cs, set->header.bo); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdBindDescriptorSets(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout _layout, uint32_t firstSet, uint32_t descriptorSetCount, const VkDescriptorSet *pDescriptorSets, uint32_t dynamicOffsetCount, @@ -4677,7 +4677,7 @@ radv_meta_push_descriptor_set(struct radv_cmd_buffer *cmd_buffer, radv_set_descriptor_set(cmd_buffer, pipelineBindPoint, push_set, set); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout _layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet *pDescriptorWrites) @@ -4711,7 +4711,7 @@ radv_CmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer, VkPipelineBindPoint descriptors_state->push_dirty = true; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdPushDescriptorSetWithTemplateKHR(VkCommandBuffer commandBuffer, VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout _layout, uint32_t set, const void *pData) @@ -4737,7 +4737,7 @@ radv_CmdPushDescriptorSetWithTemplateKHR(VkCommandBuffer commandBuffer, descriptors_state->push_dirty = true; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void *pValues) @@ -4747,7 +4747,7 @@ radv_CmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, cmd_buffer->push_constant_stages |= stageFlags; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_EndCommandBuffer(VkCommandBuffer commandBuffer) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -4836,7 +4836,7 @@ radv_mark_descriptor_sets_dirty(struct radv_cmd_buffer *cmd_buffer, VkPipelineBi descriptors_state->dirty |= descriptors_state->valid; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline _pipeline) { @@ -4919,7 +4919,7 @@ radv_CmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipeline } } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetViewport(VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, const VkViewport *pViewports) { @@ -4950,7 +4950,7 @@ radv_CmdSetViewport(VkCommandBuffer commandBuffer, uint32_t firstViewport, uint3 state->dirty |= RADV_CMD_DIRTY_DYNAMIC_VIEWPORT; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetScissor(VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_t scissorCount, const VkRect2D *pScissors) { @@ -4976,7 +4976,7 @@ radv_CmdSetScissor(VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_ state->dirty |= RADV_CMD_DIRTY_DYNAMIC_SCISSOR; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -4988,7 +4988,7 @@ radv_CmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) cmd_buffer->state.dirty |= RADV_CMD_DIRTY_DYNAMIC_LINE_WIDTH; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetDepthBias(VkCommandBuffer commandBuffer, float depthBiasConstantFactor, float depthBiasClamp, float depthBiasSlopeFactor) { @@ -5008,7 +5008,7 @@ radv_CmdSetDepthBias(VkCommandBuffer commandBuffer, float depthBiasConstantFacto state->dirty |= RADV_CMD_DIRTY_DYNAMIC_DEPTH_BIAS; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetBlendConstants(VkCommandBuffer commandBuffer, const float blendConstants[4]) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -5022,7 +5022,7 @@ radv_CmdSetBlendConstants(VkCommandBuffer commandBuffer, const float blendConsta state->dirty |= RADV_CMD_DIRTY_DYNAMIC_BLEND_CONSTANTS; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetDepthBounds(VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -5039,7 +5039,7 @@ radv_CmdSetDepthBounds(VkCommandBuffer commandBuffer, float minDepthBounds, floa state->dirty |= RADV_CMD_DIRTY_DYNAMIC_DEPTH_BOUNDS; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetStencilCompareMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask) { @@ -5061,7 +5061,7 @@ radv_CmdSetStencilCompareMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags state->dirty |= RADV_CMD_DIRTY_DYNAMIC_STENCIL_COMPARE_MASK; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetStencilWriteMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t writeMask) { @@ -5083,7 +5083,7 @@ radv_CmdSetStencilWriteMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags fa state->dirty |= RADV_CMD_DIRTY_DYNAMIC_STENCIL_WRITE_MASK; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference) { @@ -5105,7 +5105,7 @@ radv_CmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFaceFlags fa cmd_buffer->state.dirty |= RADV_CMD_DIRTY_DYNAMIC_STENCIL_REFERENCE; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetDiscardRectangleEXT(VkCommandBuffer commandBuffer, uint32_t firstDiscardRectangle, uint32_t discardRectangleCount, const VkRect2D *pDiscardRectangles) { @@ -5127,7 +5127,7 @@ radv_CmdSetDiscardRectangleEXT(VkCommandBuffer commandBuffer, uint32_t firstDisc state->dirty |= RADV_CMD_DIRTY_DYNAMIC_DISCARD_RECTANGLE; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetSampleLocationsEXT(VkCommandBuffer commandBuffer, const VkSampleLocationsInfoEXT *pSampleLocationsInfo) { @@ -5145,7 +5145,7 @@ radv_CmdSetSampleLocationsEXT(VkCommandBuffer commandBuffer, state->dirty |= RADV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetLineStippleEXT(VkCommandBuffer commandBuffer, uint32_t lineStippleFactor, uint16_t lineStipplePattern) { @@ -5162,7 +5162,7 @@ radv_CmdSetLineStippleEXT(VkCommandBuffer commandBuffer, uint32_t lineStippleFac state->dirty |= RADV_CMD_DIRTY_DYNAMIC_LINE_STIPPLE; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetCullModeEXT(VkCommandBuffer commandBuffer, VkCullModeFlags cullMode) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -5176,7 +5176,7 @@ radv_CmdSetCullModeEXT(VkCommandBuffer commandBuffer, VkCullModeFlags cullMode) state->dirty |= RADV_CMD_DIRTY_DYNAMIC_CULL_MODE; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetFrontFaceEXT(VkCommandBuffer commandBuffer, VkFrontFace frontFace) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -5190,7 +5190,7 @@ radv_CmdSetFrontFaceEXT(VkCommandBuffer commandBuffer, VkFrontFace frontFace) state->dirty |= RADV_CMD_DIRTY_DYNAMIC_FRONT_FACE; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetPrimitiveTopologyEXT(VkCommandBuffer commandBuffer, VkPrimitiveTopology primitiveTopology) { @@ -5206,21 +5206,21 @@ radv_CmdSetPrimitiveTopologyEXT(VkCommandBuffer commandBuffer, state->dirty |= RADV_CMD_DIRTY_DYNAMIC_PRIMITIVE_TOPOLOGY; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetViewportWithCountEXT(VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport *pViewports) { radv_CmdSetViewport(commandBuffer, 0, viewportCount, pViewports); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetScissorWithCountEXT(VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D *pScissors) { radv_CmdSetScissor(commandBuffer, 0, scissorCount, pScissors); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetDepthTestEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthTestEnable) { @@ -5235,7 +5235,7 @@ radv_CmdSetDepthTestEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthTestE state->dirty |= RADV_CMD_DIRTY_DYNAMIC_DEPTH_TEST_ENABLE; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetDepthWriteEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -5249,7 +5249,7 @@ radv_CmdSetDepthWriteEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthWrit state->dirty |= RADV_CMD_DIRTY_DYNAMIC_DEPTH_WRITE_ENABLE; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetDepthCompareOpEXT(VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -5263,7 +5263,7 @@ radv_CmdSetDepthCompareOpEXT(VkCommandBuffer commandBuffer, VkCompareOp depthCom state->dirty |= RADV_CMD_DIRTY_DYNAMIC_DEPTH_COMPARE_OP; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetDepthBoundsTestEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthBoundsTestEnable) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -5277,7 +5277,7 @@ radv_CmdSetDepthBoundsTestEnableEXT(VkCommandBuffer commandBuffer, VkBool32 dept state->dirty |= RADV_CMD_DIRTY_DYNAMIC_DEPTH_BOUNDS_TEST_ENABLE; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetStencilTestEnableEXT(VkCommandBuffer commandBuffer, VkBool32 stencilTestEnable) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -5291,7 +5291,7 @@ radv_CmdSetStencilTestEnableEXT(VkCommandBuffer commandBuffer, VkBool32 stencilT state->dirty |= RADV_CMD_DIRTY_DYNAMIC_STENCIL_TEST_ENABLE; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetStencilOpEXT(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, VkStencilOp failOp, VkStencilOp passOp, VkStencilOp depthFailOp, VkCompareOp compareOp) @@ -5328,7 +5328,7 @@ radv_CmdSetStencilOpEXT(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMa state->dirty |= RADV_CMD_DIRTY_DYNAMIC_STENCIL_OP; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetFragmentShadingRateKHR(VkCommandBuffer commandBuffer, const VkExtent2D *pFragmentSize, const VkFragmentShadingRateCombinerOpKHR combinerOps[2]) { @@ -5348,7 +5348,7 @@ radv_CmdSetFragmentShadingRateKHR(VkCommandBuffer commandBuffer, const VkExtent2 state->dirty |= RADV_CMD_DIRTY_DYNAMIC_FRAGMENT_SHADING_RATE; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetDepthBiasEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthBiasEnable) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -5362,7 +5362,7 @@ radv_CmdSetDepthBiasEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthBiasE state->dirty |= RADV_CMD_DIRTY_DYNAMIC_DEPTH_BIAS_ENABLE; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetPrimitiveRestartEnableEXT(VkCommandBuffer commandBuffer, VkBool32 primitiveRestartEnable) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -5376,7 +5376,7 @@ radv_CmdSetPrimitiveRestartEnableEXT(VkCommandBuffer commandBuffer, VkBool32 pri state->dirty |= RADV_CMD_DIRTY_DYNAMIC_PRIMITIVE_RESTART_ENABLE; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetRasterizerDiscardEnableEXT(VkCommandBuffer commandBuffer, VkBool32 rasterizerDiscardEnable) { @@ -5391,13 +5391,13 @@ radv_CmdSetRasterizerDiscardEnableEXT(VkCommandBuffer commandBuffer, state->dirty |= RADV_CMD_DIRTY_DYNAMIC_RASTERIZER_DISCARD_ENABLE; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetPatchControlPointsEXT(VkCommandBuffer commandBuffer, uint32_t patchControlPoints) { /* not implemented */ } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetLogicOpEXT(VkCommandBuffer commandBuffer, VkLogicOp logicOp) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -5412,7 +5412,7 @@ radv_CmdSetLogicOpEXT(VkCommandBuffer commandBuffer, VkLogicOp logicOp) state->dirty |= RADV_CMD_DIRTY_DYNAMIC_LOGIC_OP; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetColorWriteEnableEXT(VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkBool32 *pColorWriteEnables) { @@ -5434,7 +5434,7 @@ radv_CmdSetColorWriteEnableEXT(VkCommandBuffer commandBuffer, uint32_t attachmen state->dirty |= RADV_CMD_DIRTY_DYNAMIC_COLOR_WRITE_ENABLE; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetVertexInputEXT(VkCommandBuffer commandBuffer, uint32_t vertexBindingDescriptionCount, const VkVertexInputBindingDescription2EXT *pVertexBindingDescriptions, uint32_t vertexAttributeDescriptionCount, @@ -5515,7 +5515,7 @@ radv_CmdSetVertexInputEXT(VkCommandBuffer commandBuffer, uint32_t vertexBindingD cmd_buffer->state.dirty |= RADV_CMD_DIRTY_VERTEX_STATE; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer *pCmdBuffers) { @@ -5628,7 +5628,7 @@ radv_CmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCou radv_mark_descriptor_sets_dirty(primary, VK_PIPELINE_BIND_POINT_COMPUTE); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateCommandPool(VkDevice _device, const VkCommandPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkCommandPool *pCmdPool) { @@ -5657,7 +5657,7 @@ radv_CreateCommandPool(VkDevice _device, const VkCommandPoolCreateInfo *pCreateI return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyCommandPool(VkDevice _device, VkCommandPool commandPool, const VkAllocationCallbacks *pAllocator) { @@ -5681,7 +5681,7 @@ radv_DestroyCommandPool(VkDevice _device, VkCommandPool commandPool, vk_free2(&device->vk.alloc, pAllocator, pool); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_ResetCommandPool(VkDevice device, VkCommandPool commandPool, VkCommandPoolResetFlags flags) { RADV_FROM_HANDLE(radv_cmd_pool, pool, commandPool); @@ -5697,7 +5697,7 @@ radv_ResetCommandPool(VkDevice device, VkCommandPool commandPool, VkCommandPoolR return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_TrimCommandPool(VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags) { RADV_FROM_HANDLE(radv_cmd_pool, pool, commandPool); @@ -5874,7 +5874,7 @@ radv_cmd_buffer_begin_render_pass(struct radv_cmd_buffer *cmd_buffer, return; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdBeginRenderPass2(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBeginInfo, const VkSubpassBeginInfo *pSubpassBeginInfo) @@ -5886,7 +5886,7 @@ radv_CmdBeginRenderPass2(VkCommandBuffer commandBuffer, radv_cmd_buffer_begin_subpass(cmd_buffer, 0); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdNextSubpass2(VkCommandBuffer commandBuffer, const VkSubpassBeginInfo *pSubpassBeginInfo, const VkSubpassEndInfo *pSubpassEndInfo) { @@ -6666,7 +6666,7 @@ radv_after_draw(struct radv_cmd_buffer *cmd_buffer) radv_cmd_buffer_after_draw(cmd_buffer, RADV_CMD_FLAG_PS_PARTIAL_FLUSH); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) { @@ -6687,7 +6687,7 @@ radv_CmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t insta radv_after_draw(cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdDrawMultiEXT(VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawInfoEXT *pVertexInfo, uint32_t instanceCount, uint32_t firstInstance, uint32_t stride) { @@ -6710,7 +6710,7 @@ radv_CmdDrawMultiEXT(VkCommandBuffer commandBuffer, uint32_t drawCount, const Vk radv_after_draw(cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdDrawIndexed(VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t vertexOffset, uint32_t firstInstance) { @@ -6731,8 +6731,9 @@ radv_CmdDrawIndexed(VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t radv_after_draw(cmd_buffer); } -void radv_CmdDrawMultiIndexedEXT(VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawIndexedInfoEXT *pIndexInfo, - uint32_t instanceCount, uint32_t firstInstance, uint32_t stride, const int32_t *pVertexOffset) +VKAPI_ATTR void VKAPI_CALL +radv_CmdDrawMultiIndexedEXT(VkCommandBuffer commandBuffer, uint32_t drawCount, const VkMultiDrawIndexedInfoEXT *pIndexInfo, + uint32_t instanceCount, uint32_t firstInstance, uint32_t stride, const int32_t *pVertexOffset) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); struct radv_draw_info info; @@ -6754,7 +6755,7 @@ void radv_CmdDrawMultiIndexedEXT(VkCommandBuffer commandBuffer, uint32_t drawCou radv_after_draw(cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) { @@ -6777,7 +6778,7 @@ radv_CmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSi radv_after_draw(cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset, uint32_t drawCount, uint32_t stride) { @@ -6800,7 +6801,7 @@ radv_CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkD radv_after_draw(cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdDrawIndirectCount(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset, VkBuffer _countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, uint32_t stride) @@ -6826,7 +6827,7 @@ radv_CmdDrawIndirectCount(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDev radv_after_draw(cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdDrawIndexedIndirectCount(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset, VkBuffer _countBuffer, VkDeviceSize countBufferOffset, uint32_t maxDrawCount, @@ -7089,7 +7090,7 @@ radv_compute_dispatch(struct radv_cmd_buffer *cmd_buffer, const struct radv_disp VK_PIPELINE_BIND_POINT_COMPUTE); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdDispatchBase(VkCommandBuffer commandBuffer, uint32_t base_x, uint32_t base_y, uint32_t base_z, uint32_t x, uint32_t y, uint32_t z) { @@ -7106,13 +7107,13 @@ radv_CmdDispatchBase(VkCommandBuffer commandBuffer, uint32_t base_x, uint32_t ba radv_compute_dispatch(cmd_buffer, &info); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdDispatch(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, uint32_t z) { radv_CmdDispatchBase(commandBuffer, 0, 0, 0, x, y, z); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -7189,7 +7190,7 @@ radv_rt_bind_tables(struct radv_cmd_buffer *cmd_buffer, return true; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdTraceRaysKHR(VkCommandBuffer commandBuffer, const VkStridedDeviceAddressRegionKHR *pRaygenShaderBindingTable, const VkStridedDeviceAddressRegionKHR *pMissShaderBindingTable, @@ -7249,7 +7250,7 @@ radv_set_rt_stack_size(struct radv_cmd_buffer *cmd_buffer, uint32_t size) MAX2(cmd_buffer->compute_scratch_size_per_wave_needed, scratch_bytes_per_wave); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetRayTracingPipelineStackSizeKHR(VkCommandBuffer commandBuffer, uint32_t size) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -7271,7 +7272,7 @@ radv_cmd_buffer_end_render_pass(struct radv_cmd_buffer *cmd_buffer) cmd_buffer->state.subpass_sample_locs = NULL; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdEndRenderPass2(VkCommandBuffer commandBuffer, const VkSubpassEndInfo *pSubpassEndInfo) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -7749,7 +7750,7 @@ radv_barrier(struct radv_cmd_buffer *cmd_buffer, uint32_t memoryBarrierCount, radv_describe_barrier_end(cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdPipelineBarrier(VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags destStageMask, VkBool32 byRegion, uint32_t memoryBarrierCount, const VkMemoryBarrier *pMemoryBarriers, @@ -7846,7 +7847,7 @@ write_event(struct radv_cmd_buffer *cmd_buffer, struct radv_event *event, assert(cmd_buffer->cs->cdw <= cdw_max); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetEvent(VkCommandBuffer commandBuffer, VkEvent _event, VkPipelineStageFlags stageMask) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -7855,7 +7856,7 @@ radv_CmdSetEvent(VkCommandBuffer commandBuffer, VkEvent _event, VkPipelineStageF write_event(cmd_buffer, event, stageMask, 1); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdResetEvent(VkCommandBuffer commandBuffer, VkEvent _event, VkPipelineStageFlags stageMask) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -7864,7 +7865,7 @@ radv_CmdResetEvent(VkCommandBuffer commandBuffer, VkEvent _event, VkPipelineStag write_event(cmd_buffer, event, stageMask, 0); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdWaitEvents(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent *pEvents, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, uint32_t memoryBarrierCount, const VkMemoryBarrier *pMemoryBarriers, @@ -7885,14 +7886,14 @@ radv_CmdWaitEvents(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkE pBufferMemoryBarriers, imageMemoryBarrierCount, pImageMemoryBarriers, &info); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdSetDeviceMask(VkCommandBuffer commandBuffer, uint32_t deviceMask) { /* No-op */ } /* VK_EXT_conditional_rendering */ -void +VKAPI_ATTR void VKAPI_CALL radv_CmdBeginConditionalRenderingEXT( VkCommandBuffer commandBuffer, const VkConditionalRenderingBeginInfoEXT *pConditionalRenderingBegin) @@ -7977,7 +7978,7 @@ radv_CmdBeginConditionalRenderingEXT( cmd_buffer->state.predication_va = va; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdEndConditionalRenderingEXT(VkCommandBuffer commandBuffer) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -7993,7 +7994,7 @@ radv_CmdEndConditionalRenderingEXT(VkCommandBuffer commandBuffer) } /* VK_EXT_transform_feedback */ -void +VKAPI_ATTR void VKAPI_CALL radv_CmdBindTransformFeedbackBuffersEXT(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, const VkBuffer *pBuffers, const VkDeviceSize *pOffsets, const VkDeviceSize *pSizes) @@ -8213,7 +8214,7 @@ gfx10_emit_streamout_begin(struct radv_cmd_buffer *cmd_buffer, uint32_t firstCou radv_set_streamout_enable(cmd_buffer, true); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdBeginTransformFeedbackEXT(VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer *pCounterBuffers, const VkDeviceSize *pCounterBufferOffsets) @@ -8321,7 +8322,7 @@ gfx10_emit_streamout_end(struct radv_cmd_buffer *cmd_buffer, uint32_t firstCount radv_set_streamout_enable(cmd_buffer, false); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdEndTransformFeedbackEXT(VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, const VkBuffer *pCounterBuffers, const VkDeviceSize *pCounterBufferOffsets) @@ -8337,7 +8338,7 @@ radv_CmdEndTransformFeedbackEXT(VkCommandBuffer commandBuffer, uint32_t firstCou } } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuffer, uint32_t instanceCount, uint32_t firstInstance, VkBuffer _counterBuffer, VkDeviceSize counterBufferOffset, uint32_t counterOffset, @@ -8364,7 +8365,7 @@ radv_CmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuffer, uint32_t instanc } /* VK_AMD_buffer_marker */ -void +VKAPI_ATTR void VKAPI_CALL radv_CmdWriteBufferMarkerAMD(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkBuffer dstBuffer, VkDeviceSize dstOffset, uint32_t marker) { diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c index d4c769c0ea1..39878b75153 100644 --- a/src/amd/vulkan/radv_descriptor_set.c +++ b/src/amd/vulkan/radv_descriptor_set.c @@ -87,7 +87,7 @@ radv_mutable_descriptor_type_size_alignment(const VkMutableDescriptorTypeListVAL return true; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateDescriptorSetLayout(VkDevice _device, const VkDescriptorSetLayoutCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDescriptorSetLayout *pSetLayout) @@ -335,7 +335,7 @@ radv_CreateDescriptorSetLayout(VkDevice _device, const VkDescriptorSetLayoutCrea return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyDescriptorSetLayout(VkDevice _device, VkDescriptorSetLayout _set_layout, const VkAllocationCallbacks *pAllocator) { @@ -349,7 +349,7 @@ radv_DestroyDescriptorSetLayout(VkDevice _device, VkDescriptorSetLayout _set_lay vk_free2(&device->vk.alloc, pAllocator, set_layout); } -void +VKAPI_ATTR void VKAPI_CALL radv_GetDescriptorSetLayoutSupport(VkDevice device, const VkDescriptorSetLayoutCreateInfo *pCreateInfo, VkDescriptorSetLayoutSupport *pSupport) @@ -466,7 +466,7 @@ radv_GetDescriptorSetLayoutSupport(VkDevice device, * just multiple descriptor set layouts pasted together. */ -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreatePipelineLayout(VkDevice _device, const VkPipelineLayoutCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkPipelineLayout *pPipelineLayout) @@ -525,7 +525,7 @@ radv_CreatePipelineLayout(VkDevice _device, const VkPipelineLayoutCreateInfo *pC return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyPipelineLayout(VkDevice _device, VkPipelineLayout _pipelineLayout, const VkAllocationCallbacks *pAllocator) { @@ -704,7 +704,7 @@ radv_destroy_descriptor_pool(struct radv_device *device, const VkAllocationCallb vk_free2(&device->vk.alloc, pAllocator, pool); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateDescriptorPool(VkDevice _device, const VkDescriptorPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDescriptorPool *pDescriptorPool) @@ -841,7 +841,7 @@ radv_CreateDescriptorPool(VkDevice _device, const VkDescriptorPoolCreateInfo *pC return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyDescriptorPool(VkDevice _device, VkDescriptorPool _pool, const VkAllocationCallbacks *pAllocator) { @@ -854,7 +854,7 @@ radv_DestroyDescriptorPool(VkDevice _device, VkDescriptorPool _pool, radv_destroy_descriptor_pool(device, pAllocator, pool); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_ResetDescriptorPool(VkDevice _device, VkDescriptorPool descriptorPool, VkDescriptorPoolResetFlags flags) { @@ -874,7 +874,7 @@ radv_ResetDescriptorPool(VkDevice _device, VkDescriptorPool descriptorPool, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_AllocateDescriptorSets(VkDevice _device, const VkDescriptorSetAllocateInfo *pAllocateInfo, VkDescriptorSet *pDescriptorSets) { @@ -919,7 +919,7 @@ radv_AllocateDescriptorSets(VkDevice _device, const VkDescriptorSetAllocateInfo return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_FreeDescriptorSets(VkDevice _device, VkDescriptorPool descriptorPool, uint32_t count, const VkDescriptorSet *pDescriptorSets) { @@ -1285,7 +1285,7 @@ radv_update_descriptor_sets_impl(struct radv_device *device, struct radv_cmd_buf } } -void +VKAPI_ATTR void VKAPI_CALL radv_UpdateDescriptorSets(VkDevice _device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet *pDescriptorWrites, uint32_t descriptorCopyCount, @@ -1310,7 +1310,7 @@ radv_cmd_update_descriptor_sets(struct radv_device *device, struct radv_cmd_buff pDescriptorWrites, descriptorCopyCount, pDescriptorCopies); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateDescriptorUpdateTemplate(VkDevice _device, const VkDescriptorUpdateTemplateCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -1405,7 +1405,7 @@ radv_CreateDescriptorUpdateTemplate(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyDescriptorUpdateTemplate(VkDevice _device, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const VkAllocationCallbacks *pAllocator) @@ -1514,7 +1514,7 @@ radv_cmd_update_descriptor_set_with_template(struct radv_device *device, radv_update_descriptor_set_with_template_impl(device, cmd_buffer, set, descriptorUpdateTemplate, pData); } -void +VKAPI_ATTR void VKAPI_CALL radv_UpdateDescriptorSetWithTemplate(VkDevice _device, VkDescriptorSet descriptorSet, VkDescriptorUpdateTemplate descriptorUpdateTemplate, const void *pData) @@ -1525,7 +1525,7 @@ radv_UpdateDescriptorSetWithTemplate(VkDevice _device, VkDescriptorSet descripto radv_update_descriptor_set_with_template_impl(device, NULL, set, descriptorUpdateTemplate, pData); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateSamplerYcbcrConversion(VkDevice _device, const VkSamplerYcbcrConversionCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -1554,7 +1554,7 @@ radv_CreateSamplerYcbcrConversion(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroySamplerYcbcrConversion(VkDevice _device, VkSamplerYcbcrConversion ycbcrConversion, const VkAllocationCallbacks *pAllocator) { diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index a7555584bf8..d3e7b6952d4 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -358,7 +358,7 @@ radv_thread_trace_enabled() #define RADV_API_VERSION VK_MAKE_VERSION(1, 2, VK_HEADER_VERSION) #endif -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_EnumerateInstanceVersion(uint32_t *pApiVersion) { *pApiVersion = RADV_API_VERSION; @@ -949,7 +949,7 @@ radv_init_dri_options(struct radv_instance *instance) driQueryOptionb(&instance->dri_options, "radv_report_apu_as_dgpu"); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkInstance *pInstance) { @@ -991,7 +991,7 @@ radv_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyInstance(VkInstance _instance, const VkAllocationCallbacks *pAllocator) { RADV_FROM_HANDLE(radv_instance, instance, _instance); @@ -1076,7 +1076,7 @@ radv_enumerate_physical_devices(struct radv_instance *instance) return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_EnumeratePhysicalDevices(VkInstance _instance, uint32_t *pPhysicalDeviceCount, VkPhysicalDevice *pPhysicalDevices) { @@ -1098,7 +1098,7 @@ radv_EnumeratePhysicalDevices(VkInstance _instance, uint32_t *pPhysicalDeviceCou return vk_outarray_status(&out); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_EnumeratePhysicalDeviceGroups(VkInstance _instance, uint32_t *pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties *pPhysicalDeviceGroupProperties) { @@ -1124,7 +1124,7 @@ radv_EnumeratePhysicalDeviceGroups(VkInstance _instance, uint32_t *pPhysicalDevi return vk_outarray_status(&out); } -void +VKAPI_ATTR void VKAPI_CALL radv_GetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures *pFeatures) { RADV_FROM_HANDLE(radv_physical_device, pdevice, physicalDevice); @@ -1260,7 +1260,7 @@ radv_get_physical_device_features_1_2(struct radv_physical_device *pdevice, f->subgroupBroadcastDynamicId = true; } -void +VKAPI_ATTR void VKAPI_CALL radv_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2 *pFeatures) { @@ -1670,7 +1670,7 @@ radv_uniform_buffer_offset_alignment(const struct radv_physical_device *pdevice) return MAX2(uniform_offset_alignment, 4); } -void +VKAPI_ATTR void VKAPI_CALL radv_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties *pProperties) { @@ -1951,7 +1951,7 @@ radv_get_physical_device_properties_1_2(struct radv_physical_device *pdevice, p->framebufferIntegerColorSampleCounts = VK_SAMPLE_COUNT_1_BIT; } -void +VKAPI_ATTR void VKAPI_CALL radv_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) { @@ -2322,7 +2322,7 @@ radv_get_physical_device_queue_family_properties(struct radv_physical_device *pd *pCount = idx; } -void +VKAPI_ATTR void VKAPI_CALL radv_GetPhysicalDeviceQueueFamilyProperties(VkPhysicalDevice physicalDevice, uint32_t *pCount, VkQueueFamilyProperties *pQueueFamilyProperties) { @@ -2347,7 +2347,7 @@ static const VkQueueGlobalPriorityEXT radv_global_queue_priorities[] = { VK_QUEUE_GLOBAL_PRIORITY_REALTIME_EXT, }; -void +VKAPI_ATTR void VKAPI_CALL radv_GetPhysicalDeviceQueueFamilyProperties2(VkPhysicalDevice physicalDevice, uint32_t *pCount, VkQueueFamilyProperties2 *pQueueFamilyProperties) { @@ -2383,7 +2383,7 @@ radv_GetPhysicalDeviceQueueFamilyProperties2(VkPhysicalDevice physicalDevice, ui } } -void +VKAPI_ATTR void VKAPI_CALL radv_GetPhysicalDeviceMemoryProperties(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties *pMemoryProperties) { @@ -2497,7 +2497,7 @@ radv_get_memory_budget_properties(VkPhysicalDevice physicalDevice, } } -void +VKAPI_ATTR void VKAPI_CALL radv_GetPhysicalDeviceMemoryProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryProperties2 *pMemoryProperties) { @@ -2509,7 +2509,7 @@ radv_GetPhysicalDeviceMemoryProperties2(VkPhysicalDevice physicalDevice, radv_get_memory_budget_properties(physicalDevice, memory_budget); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetMemoryHostPointerPropertiesEXT( VkDevice _device, VkExternalMemoryHandleTypeFlagBits handleType, const void *pHostPointer, VkMemoryHostPointerPropertiesEXT *pMemoryHostPointerProperties) @@ -2873,7 +2873,7 @@ _radv_device_set_lost(struct radv_device *device, const char *file, int line, co return err; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDevice *pDevice) { @@ -3265,7 +3265,7 @@ fail: return result; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyDevice(VkDevice _device, const VkAllocationCallbacks *pAllocator) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -3312,7 +3312,7 @@ radv_DestroyDevice(VkDevice _device, const VkAllocationCallbacks *pAllocator) vk_free(&device->vk.alloc, device); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_EnumerateInstanceLayerProperties(uint32_t *pPropertyCount, VkLayerProperties *pProperties) { if (pProperties == NULL) { @@ -3324,7 +3324,7 @@ radv_EnumerateInstanceLayerProperties(uint32_t *pPropertyCount, VkLayerPropertie return vk_error(NULL, VK_ERROR_LAYER_NOT_PRESENT); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_EnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, uint32_t *pPropertyCount, VkLayerProperties *pProperties) { @@ -4970,7 +4970,7 @@ radv_submit_has_effects(const VkSubmitInfo *info) return info->commandBufferCount || info->waitSemaphoreCount || info->signalSemaphoreCount; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_QueueSubmit(VkQueue _queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence) { RADV_FROM_HANDLE(radv_queue, queue, _queue); @@ -5050,7 +5050,7 @@ radv_get_queue_family_name(struct radv_queue *queue) } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_QueueWaitIdle(VkQueue _queue) { RADV_FROM_HANDLE(radv_queue, queue, _queue); @@ -5076,7 +5076,7 @@ radv_QueueWaitIdle(VkQueue _queue) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_EnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) { @@ -5087,7 +5087,7 @@ radv_EnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pPro pPropertyCount, pProperties); } -PFN_vkVoidFunction +VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL radv_GetInstanceProcAddr(VkInstance _instance, const char *pName) { RADV_FROM_HANDLE(radv_instance, instance, _instance); @@ -5403,7 +5403,7 @@ fail: return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_AllocateMemory(VkDevice _device, const VkMemoryAllocateInfo *pAllocateInfo, const VkAllocationCallbacks *pAllocator, VkDeviceMemory *pMem) { @@ -5411,7 +5411,7 @@ radv_AllocateMemory(VkDevice _device, const VkMemoryAllocateInfo *pAllocateInfo, return radv_alloc_memory(device, pAllocateInfo, pAllocator, pMem); } -void +VKAPI_ATTR void VKAPI_CALL radv_FreeMemory(VkDevice _device, VkDeviceMemory _mem, const VkAllocationCallbacks *pAllocator) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -5420,7 +5420,7 @@ radv_FreeMemory(VkDevice _device, VkDeviceMemory _mem, const VkAllocationCallbac radv_free_memory(device, pAllocator, mem); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_MapMemory(VkDevice _device, VkDeviceMemory _memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void **ppData) { @@ -5445,7 +5445,7 @@ radv_MapMemory(VkDevice _device, VkDeviceMemory _memory, VkDeviceSize offset, Vk return vk_error(device, VK_ERROR_MEMORY_MAP_FAILED); } -void +VKAPI_ATTR void VKAPI_CALL radv_UnmapMemory(VkDevice _device, VkDeviceMemory _memory) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -5458,14 +5458,14 @@ radv_UnmapMemory(VkDevice _device, VkDeviceMemory _memory) device->ws->buffer_unmap(mem->bo); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_FlushMappedMemoryRanges(VkDevice _device, uint32_t memoryRangeCount, const VkMappedMemoryRange *pMemoryRanges) { return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_InvalidateMappedMemoryRanges(VkDevice _device, uint32_t memoryRangeCount, const VkMappedMemoryRange *pMemoryRanges) { @@ -5504,7 +5504,7 @@ radv_get_buffer_memory_requirements(struct radv_device *device, } } -void +VKAPI_ATTR void VKAPI_CALL radv_GetBufferMemoryRequirements2(VkDevice _device, const VkBufferMemoryRequirementsInfo2 *pInfo, VkMemoryRequirements2 *pMemoryRequirements) { @@ -5514,7 +5514,7 @@ radv_GetBufferMemoryRequirements2(VkDevice _device, const VkBufferMemoryRequirem radv_get_buffer_memory_requirements(device, buffer->size, buffer->flags, pMemoryRequirements); } -void +VKAPI_ATTR void VKAPI_CALL radv_GetDeviceBufferMemoryRequirementsKHR(VkDevice _device, const VkDeviceBufferMemoryRequirementsKHR* pInfo, VkMemoryRequirements2 *pMemoryRequirements) @@ -5525,7 +5525,7 @@ radv_GetDeviceBufferMemoryRequirementsKHR(VkDevice _device, pMemoryRequirements); } -void +VKAPI_ATTR void VKAPI_CALL radv_GetImageMemoryRequirements2(VkDevice _device, const VkImageMemoryRequirementsInfo2 *pInfo, VkMemoryRequirements2 *pMemoryRequirements) { @@ -5554,7 +5554,7 @@ radv_GetImageMemoryRequirements2(VkDevice _device, const VkImageMemoryRequiremen } } -void +VKAPI_ATTR void VKAPI_CALL radv_GetDeviceImageMemoryRequirementsKHR(VkDevice device, const VkDeviceImageMemoryRequirementsKHR *pInfo, VkMemoryRequirements2 *pMemoryRequirements) @@ -5579,14 +5579,14 @@ radv_GetDeviceImageMemoryRequirementsKHR(VkDevice device, radv_DestroyImage(device, image, NULL); } -void +VKAPI_ATTR void VKAPI_CALL radv_GetDeviceMemoryCommitment(VkDevice device, VkDeviceMemory memory, VkDeviceSize *pCommittedMemoryInBytes) { *pCommittedMemoryInBytes = 0; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_BindBufferMemory2(VkDevice _device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo *pBindInfos) { @@ -5623,7 +5623,7 @@ radv_BindBufferMemory2(VkDevice _device, uint32_t bindInfoCount, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_BindImageMemory2(VkDevice _device, uint32_t bindInfoCount, const VkBindImageMemoryInfo *pBindInfos) { @@ -5668,7 +5668,7 @@ radv_sparse_bind_has_effects(const VkBindSparseInfo *info) info->waitSemaphoreCount || info->signalSemaphoreCount; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_QueueBindSparse(VkQueue _queue, uint32_t bindInfoCount, const VkBindSparseInfo *pBindInfo, VkFence fence) { @@ -5747,7 +5747,7 @@ radv_destroy_fence(struct radv_device *device, const VkAllocationCallbacks *pAll vk_free2(&device->vk.alloc, pAllocator, fence); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateFence(VkDevice _device, const VkFenceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkFence *pFence) { @@ -5779,7 +5779,7 @@ radv_CreateFence(VkDevice _device, const VkFenceCreateInfo *pCreateInfo, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyFence(VkDevice _device, VkFence _fence, const VkAllocationCallbacks *pAllocator) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -5791,7 +5791,7 @@ radv_DestroyFence(VkDevice _device, VkFence _fence, const VkAllocationCallbacks radv_destroy_fence(device, pAllocator, fence); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_WaitForFences(VkDevice _device, uint32_t fenceCount, const VkFence *pFences, VkBool32 waitAll, uint64_t timeout) { @@ -5822,7 +5822,7 @@ radv_WaitForFences(VkDevice _device, uint32_t fenceCount, const VkFence *pFences return success ? VK_SUCCESS : VK_TIMEOUT; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_ResetFences(VkDevice _device, uint32_t fenceCount, const VkFence *pFences) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -5847,7 +5847,7 @@ radv_ResetFences(VkDevice _device, uint32_t fenceCount, const VkFence *pFences) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetFenceStatus(VkDevice _device, VkFence _fence) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -6064,7 +6064,7 @@ radv_destroy_semaphore(struct radv_device *device, const VkAllocationCallbacks * vk_free2(&device->vk.alloc, pAllocator, sem); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateSemaphore(VkDevice _device, const VkSemaphoreCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSemaphore *pSemaphore) { @@ -6108,7 +6108,7 @@ radv_CreateSemaphore(VkDevice _device, const VkSemaphoreCreateInfo *pCreateInfo, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroySemaphore(VkDevice _device, VkSemaphore _semaphore, const VkAllocationCallbacks *pAllocator) { @@ -6120,7 +6120,7 @@ radv_DestroySemaphore(VkDevice _device, VkSemaphore _semaphore, radv_destroy_semaphore(device, pAllocator, sem); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetSemaphoreCounterValue(VkDevice _device, VkSemaphore _semaphore, uint64_t *pValue) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -6180,7 +6180,7 @@ radv_wait_timelines(struct radv_device *device, const VkSemaphoreWaitInfo *pWait } return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_WaitSemaphores(VkDevice _device, const VkSemaphoreWaitInfo *pWaitInfo, uint64_t timeout) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -6215,7 +6215,7 @@ radv_WaitSemaphores(VkDevice _device, const VkSemaphoreWaitInfo *pWaitInfo, uint return success ? VK_SUCCESS : VK_TIMEOUT; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_SignalSemaphore(VkDevice _device, const VkSemaphoreSignalInfo *pSignalInfo) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -6271,7 +6271,7 @@ radv_destroy_event(struct radv_device *device, const VkAllocationCallbacks *pAll vk_free2(&device->vk.alloc, pAllocator, event); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateEvent(VkDevice _device, const VkEventCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkEvent *pEvent) { @@ -6304,7 +6304,7 @@ radv_CreateEvent(VkDevice _device, const VkEventCreateInfo *pCreateInfo, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyEvent(VkDevice _device, VkEvent _event, const VkAllocationCallbacks *pAllocator) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -6316,7 +6316,7 @@ radv_DestroyEvent(VkDevice _device, VkEvent _event, const VkAllocationCallbacks radv_destroy_event(device, pAllocator, event); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetEventStatus(VkDevice _device, VkEvent _event) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -6330,7 +6330,7 @@ radv_GetEventStatus(VkDevice _device, VkEvent _event) return VK_EVENT_RESET; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_SetEvent(VkDevice _device, VkEvent _event) { RADV_FROM_HANDLE(radv_event, event, _event); @@ -6339,7 +6339,7 @@ radv_SetEvent(VkDevice _device, VkEvent _event) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_ResetEvent(VkDevice _device, VkEvent _event) { RADV_FROM_HANDLE(radv_event, event, _event); @@ -6379,7 +6379,7 @@ radv_destroy_buffer(struct radv_device *device, const VkAllocationCallbacks *pAl vk_free2(&device->vk.alloc, pAllocator, buffer); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateBuffer(VkDevice _device, const VkBufferCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkBuffer *pBuffer) { @@ -6429,7 +6429,7 @@ radv_CreateBuffer(VkDevice _device, const VkBufferCreateInfo *pCreateInfo, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyBuffer(VkDevice _device, VkBuffer _buffer, const VkAllocationCallbacks *pAllocator) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -6441,21 +6441,21 @@ radv_DestroyBuffer(VkDevice _device, VkBuffer _buffer, const VkAllocationCallbac radv_destroy_buffer(device, pAllocator, buffer); } -VkDeviceAddress +VKAPI_ATTR VkDeviceAddress VKAPI_CALL radv_GetBufferDeviceAddress(VkDevice device, const VkBufferDeviceAddressInfo *pInfo) { RADV_FROM_HANDLE(radv_buffer, buffer, pInfo->buffer); return radv_buffer_get_va(buffer->bo) + buffer->offset; } -uint64_t +VKAPI_ATTR uint64_t VKAPI_CALL radv_GetBufferOpaqueCaptureAddress(VkDevice device, const VkBufferDeviceAddressInfo *pInfo) { RADV_FROM_HANDLE(radv_buffer, buffer, pInfo->buffer); return buffer->bo ? radv_buffer_get_va(buffer->bo) + buffer->offset : 0; } -uint64_t +VKAPI_ATTR uint64_t VKAPI_CALL radv_GetDeviceMemoryOpaqueCaptureAddress(VkDevice device, const VkDeviceMemoryOpaqueCaptureAddressInfo *pInfo) { @@ -7023,7 +7023,7 @@ radv_initialise_ds_surface(struct radv_device *device, struct radv_ds_buffer_inf ds->db_stencil_read_base = ds->db_stencil_write_base = s_offs >> 8; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateFramebuffer(VkDevice _device, const VkFramebufferCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkFramebuffer *pFramebuffer) { @@ -7061,7 +7061,7 @@ radv_CreateFramebuffer(VkDevice _device, const VkFramebufferCreateInfo *pCreateI return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyFramebuffer(VkDevice _device, VkFramebuffer _fb, const VkAllocationCallbacks *pAllocator) { @@ -7333,7 +7333,7 @@ radv_init_sampler(struct radv_device *device, struct radv_sampler *sampler, } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateSampler(VkDevice _device, const VkSamplerCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkSampler *pSampler) { @@ -7362,7 +7362,7 @@ radv_CreateSampler(VkDevice _device, const VkSamplerCreateInfo *pCreateInfo, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroySampler(VkDevice _device, VkSampler _sampler, const VkAllocationCallbacks *pAllocator) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -7416,7 +7416,7 @@ vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *pSupportedVersion) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetMemoryFdKHR(VkDevice _device, const VkMemoryGetFdInfoKHR *pGetFdInfo, int *pFD) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -7479,7 +7479,7 @@ radv_compute_valid_memory_types(struct radv_physical_device *dev, enum radeon_bo return bits; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetMemoryFdPropertiesKHR(VkDevice _device, VkExternalMemoryHandleTypeFlagBits handleType, int fd, VkMemoryFdPropertiesKHR *pMemoryFdProperties) { @@ -7555,7 +7555,7 @@ radv_import_sync_fd(struct radv_device *device, int fd, uint32_t *syncobj) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_ImportSemaphoreFdKHR(VkDevice _device, const VkImportSemaphoreFdInfoKHR *pImportSemaphoreFdInfo) { @@ -7601,7 +7601,7 @@ radv_ImportSemaphoreFdKHR(VkDevice _device, return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetSemaphoreFdKHR(VkDevice _device, const VkSemaphoreGetFdInfoKHR *pGetFdInfo, int *pFd) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -7643,7 +7643,7 @@ radv_GetSemaphoreFdKHR(VkDevice _device, const VkSemaphoreGetFdInfoKHR *pGetFdIn return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_GetPhysicalDeviceExternalSemaphoreProperties( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo, @@ -7693,7 +7693,7 @@ radv_GetPhysicalDeviceExternalSemaphoreProperties( } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_ImportFenceFdKHR(VkDevice _device, const VkImportFenceFdInfoKHR *pImportFenceFdInfo) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -7728,7 +7728,7 @@ radv_ImportFenceFdKHR(VkDevice _device, const VkImportFenceFdInfoKHR *pImportFen return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetFenceFdKHR(VkDevice _device, const VkFenceGetFdInfoKHR *pGetFdInfo, int *pFd) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -7762,7 +7762,7 @@ radv_GetFenceFdKHR(VkDevice _device, const VkFenceGetFdInfoKHR *pGetFdInfo, int return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_GetPhysicalDeviceExternalFenceProperties( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo *pExternalFenceInfo, VkExternalFenceProperties *pExternalFenceProperties) @@ -7782,7 +7782,7 @@ radv_GetPhysicalDeviceExternalFenceProperties( } } -void +VKAPI_ATTR void VKAPI_CALL radv_GetDeviceGroupPeerMemoryFeatures(VkDevice device, uint32_t heapIndex, uint32_t localDeviceIndex, uint32_t remoteDeviceIndex, VkPeerMemoryFeatureFlags *pPeerMemoryFeatures) @@ -7802,7 +7802,7 @@ static const VkTimeDomainEXT radv_time_domains[] = { #endif }; -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice physicalDevice, uint32_t *pTimeDomainCount, VkTimeDomainEXT *pTimeDomains) @@ -7838,7 +7838,7 @@ radv_clock_gettime(clockid_t clock_id) return (uint64_t)current.tv_sec * 1000000000ULL + current.tv_nsec; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetCalibratedTimestampsEXT(VkDevice _device, uint32_t timestampCount, const VkCalibratedTimestampInfoEXT *pTimestampInfos, uint64_t *pTimestamps, uint64_t *pMaxDeviation) @@ -7927,7 +7927,7 @@ radv_GetCalibratedTimestampsEXT(VkDevice _device, uint32_t timestampCount, } #endif -void +VKAPI_ATTR void VKAPI_CALL radv_GetPhysicalDeviceMultisamplePropertiesEXT(VkPhysicalDevice physicalDevice, VkSampleCountFlagBits samples, VkMultisamplePropertiesEXT *pMultisampleProperties) @@ -7942,7 +7942,7 @@ radv_GetPhysicalDeviceMultisamplePropertiesEXT(VkPhysicalDevice physicalDevice, } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetPhysicalDeviceFragmentShadingRatesKHR( VkPhysicalDevice physicalDevice, uint32_t *pFragmentShadingRateCount, VkPhysicalDeviceFragmentShadingRateKHR *pFragmentShadingRates) diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c index 6b5692d7690..3727376eb53 100644 --- a/src/amd/vulkan/radv_formats.c +++ b/src/amd/vulkan/radv_formats.c @@ -1421,7 +1421,7 @@ radv_check_modifier_support(struct radv_physical_device *dev, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice, VkFormat format, VkFormatProperties2 *pFormatProperties) { @@ -1728,7 +1728,7 @@ get_external_image_format_properties(struct radv_physical_device *physical_devic }; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *base_info, VkImageFormatProperties2 *base_props) @@ -1864,7 +1864,7 @@ fill_sparse_image_format_properties(struct radv_physical_device *pdev, VkFormat prop->imageGranularity = (VkExtent3D){w, h, 1}; } -void +VKAPI_ATTR void VKAPI_CALL radv_GetPhysicalDeviceSparseImageFormatProperties2( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2 *pFormatInfo, uint32_t *pPropertyCount, VkSparseImageFormatProperties2 *pProperties) @@ -1900,7 +1900,7 @@ radv_GetPhysicalDeviceSparseImageFormatProperties2( }; } -void +VKAPI_ATTR void VKAPI_CALL radv_GetImageSparseMemoryRequirements2(VkDevice _device, const VkImageSparseMemoryRequirementsInfo2 *pInfo, uint32_t *pSparseMemoryRequirementCount, @@ -1950,7 +1950,7 @@ radv_GetImageSparseMemoryRequirements2(VkDevice _device, }; } -void +VKAPI_ATTR void VKAPI_CALL radv_GetDeviceImageSparseMemoryRequirementsKHR(VkDevice device, const VkDeviceImageMemoryRequirementsKHR* pInfo, uint32_t *pSparseMemoryRequirementCount, @@ -1977,7 +1977,7 @@ radv_GetDeviceImageSparseMemoryRequirementsKHR(VkDevice device, radv_DestroyImage(device, image, NULL); } -void +VKAPI_ATTR void VKAPI_CALL radv_GetPhysicalDeviceExternalBufferProperties( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo, VkExternalBufferProperties *pExternalBufferProperties) diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 5430f94794e..f0597cac1b1 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -2196,7 +2196,7 @@ radv_image_queue_family_mask(const struct radv_image *image, uint32_t family, ui return 1u << family; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateImage(VkDevice device, const VkImageCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkImage *pImage) { @@ -2220,7 +2220,7 @@ radv_CreateImage(VkDevice device, const VkImageCreateInfo *pCreateInfo, pAllocator, pImage); } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyImage(VkDevice _device, VkImage _image, const VkAllocationCallbacks *pAllocator) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -2232,7 +2232,7 @@ radv_DestroyImage(VkDevice _device, VkImage _image, const VkAllocationCallbacks radv_destroy_image(device, pAllocator, image); } -void +VKAPI_ATTR void VKAPI_CALL radv_GetImageSubresourceLayout(VkDevice _device, VkImage _image, const VkImageSubresource *pSubresource, VkSubresourceLayout *pLayout) { @@ -2300,7 +2300,7 @@ radv_GetImageSubresourceLayout(VkDevice _device, VkImage _image, } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetImageDrmFormatModifierPropertiesEXT(VkDevice _device, VkImage _image, VkImageDrmFormatModifierPropertiesEXT *pProperties) { @@ -2310,7 +2310,7 @@ radv_GetImageDrmFormatModifierPropertiesEXT(VkDevice _device, VkImage _image, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateImageView(VkDevice _device, const VkImageViewCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkImageView *pView) { @@ -2329,7 +2329,7 @@ radv_CreateImageView(VkDevice _device, const VkImageViewCreateInfo *pCreateInfo, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyImageView(VkDevice _device, VkImageView _iview, const VkAllocationCallbacks *pAllocator) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -2365,7 +2365,7 @@ radv_buffer_view_finish(struct radv_buffer_view *view) vk_object_base_finish(&view->base); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateBufferView(VkDevice _device, const VkBufferViewCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkBufferView *pView) { @@ -2384,7 +2384,7 @@ radv_CreateBufferView(VkDevice _device, const VkBufferViewCreateInfo *pCreateInf return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyBufferView(VkDevice _device, VkBufferView bufferView, const VkAllocationCallbacks *pAllocator) { diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c index 8e2a9180d04..557535f1262 100644 --- a/src/amd/vulkan/radv_meta.c +++ b/src/amd/vulkan/radv_meta.c @@ -288,7 +288,7 @@ radv_meta_get_iview_layer(const struct radv_image *dest_image, } } -static void * +static VKAPI_ATTR void * VKAPI_CALL meta_alloc(void *_device, size_t size, size_t alignment, VkSystemAllocationScope allocationScope) { struct radv_device *device = _device; @@ -296,7 +296,7 @@ meta_alloc(void *_device, size_t size, size_t alignment, VkSystemAllocationScope VK_SYSTEM_ALLOCATION_SCOPE_DEVICE); } -static void * +static VKAPI_ATTR void * VKAPI_CALL meta_realloc(void *_device, void *original, size_t size, size_t alignment, VkSystemAllocationScope allocationScope) { @@ -305,7 +305,7 @@ meta_realloc(void *_device, void *original, size_t size, size_t alignment, VK_SYSTEM_ALLOCATION_SCOPE_DEVICE); } -static void +static VKAPI_ATTR void VKAPI_CALL meta_free(void *_device, void *data) { struct radv_device *device = _device; diff --git a/src/amd/vulkan/radv_meta_blit.c b/src/amd/vulkan/radv_meta_blit.c index 0c13e158298..cd9ba37b4af 100644 --- a/src/amd/vulkan/radv_meta_blit.c +++ b/src/amd/vulkan/radv_meta_blit.c @@ -626,7 +626,7 @@ blit_image(struct radv_cmd_buffer *cmd_buffer, struct radv_image *src_image, radv_DestroySampler(radv_device_to_handle(device), sampler, &cmd_buffer->pool->alloc); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdBlitImage2KHR(VkCommandBuffer commandBuffer, const VkBlitImageInfo2KHR *pBlitImageInfo) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); diff --git a/src/amd/vulkan/radv_meta_buffer.c b/src/amd/vulkan/radv_meta_buffer.c index b66bb57a1ac..065cbb0c373 100644 --- a/src/amd/vulkan/radv_meta_buffer.c +++ b/src/amd/vulkan/radv_meta_buffer.c @@ -356,7 +356,7 @@ radv_copy_buffer(struct radv_cmd_buffer *cmd_buffer, struct radeon_winsys_bo *sr } } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize fillSize, uint32_t data) { @@ -390,7 +390,7 @@ copy_buffer(struct radv_cmd_buffer *cmd_buffer, struct radv_buffer *src_buffer, cmd_buffer->state.predicating = old_predicating; } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdCopyBuffer2KHR(VkCommandBuffer commandBuffer, const VkCopyBufferInfo2KHR *pCopyBufferInfo) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); @@ -425,7 +425,7 @@ radv_update_buffer_cp(struct radv_cmd_buffer *cmd_buffer, uint64_t va, const voi radv_cmd_buffer_trace_emit(cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize dataSize, const void *pData) { diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c index 8a3ff022ec1..0cb4e999476 100644 --- a/src/amd/vulkan/radv_meta_clear.c +++ b/src/amd/vulkan/radv_meta_clear.c @@ -2418,7 +2418,7 @@ radv_cmd_clear_image(struct radv_cmd_buffer *cmd_buffer, struct radv_image *imag } } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdClearColorImage(VkCommandBuffer commandBuffer, VkImage image_h, VkImageLayout imageLayout, const VkClearColorValue *pColor, uint32_t rangeCount, const VkImageSubresourceRange *pRanges) @@ -2446,7 +2446,7 @@ radv_CmdClearColorImage(VkCommandBuffer commandBuffer, VkImage image_h, VkImageL radv_meta_restore(&saved_state, cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdClearDepthStencilImage(VkCommandBuffer commandBuffer, VkImage image_h, VkImageLayout imageLayout, const VkClearDepthStencilValue *pDepthStencil, uint32_t rangeCount, @@ -2465,7 +2465,7 @@ radv_CmdClearDepthStencilImage(VkCommandBuffer commandBuffer, VkImage image_h, radv_meta_restore(&saved_state, cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdClearAttachments(VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment *pAttachments, uint32_t rectCount, const VkClearRect *pRects) diff --git a/src/amd/vulkan/radv_meta_copy.c b/src/amd/vulkan/radv_meta_copy.c index 22aa69bca1a..b9b45750625 100644 --- a/src/amd/vulkan/radv_meta_copy.c +++ b/src/amd/vulkan/radv_meta_copy.c @@ -243,7 +243,7 @@ copy_buffer_to_image(struct radv_cmd_buffer *cmd_buffer, struct radv_buffer *buf radv_meta_restore(&saved_state, cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdCopyBufferToImage2KHR(VkCommandBuffer commandBuffer, const VkCopyBufferToImageInfo2KHR *pCopyBufferToImageInfo) { @@ -361,7 +361,7 @@ copy_image_to_buffer(struct radv_cmd_buffer *cmd_buffer, struct radv_buffer *buf radv_meta_restore(&saved_state, cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdCopyImageToBuffer2KHR(VkCommandBuffer commandBuffer, const VkCopyImageToBufferInfo2KHR *pCopyImageToBufferInfo) { @@ -577,7 +577,7 @@ copy_image(struct radv_cmd_buffer *cmd_buffer, struct radv_image *src_image, radv_meta_restore(&saved_state, cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdCopyImage2KHR(VkCommandBuffer commandBuffer, const VkCopyImageInfo2KHR *pCopyImageInfo) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c index b012a757e5b..590a0a5df1b 100644 --- a/src/amd/vulkan/radv_meta_resolve.c +++ b/src/amd/vulkan/radv_meta_resolve.c @@ -632,7 +632,7 @@ resolve_image(struct radv_cmd_buffer *cmd_buffer, struct radv_image *src_image, } } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdResolveImage2KHR(VkCommandBuffer commandBuffer, const VkResolveImageInfo2KHR *pResolveImageInfo) { diff --git a/src/amd/vulkan/radv_pass.c b/src/amd/vulkan/radv_pass.c index 8247174ec56..840105a3fba 100644 --- a/src/amd/vulkan/radv_pass.c +++ b/src/amd/vulkan/radv_pass.c @@ -310,7 +310,7 @@ radv_num_subpass_attachments2(const VkSubpassDescription2 *desc) (vrs && vrs->pFragmentShadingRateAttachment); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateRenderPass2(VkDevice _device, const VkRenderPassCreateInfo2 *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkRenderPass *pRenderPass) { @@ -486,7 +486,7 @@ radv_CreateRenderPass2(VkDevice _device, const VkRenderPassCreateInfo2 *pCreateI return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyRenderPass(VkDevice _device, VkRenderPass _pass, const VkAllocationCallbacks *pAllocator) { @@ -499,7 +499,7 @@ radv_DestroyRenderPass(VkDevice _device, VkRenderPass _pass, radv_destroy_render_pass(device, pAllocator, pass); } -void +VKAPI_ATTR void VKAPI_CALL radv_GetRenderAreaGranularity(VkDevice device, VkRenderPass renderPass, VkExtent2D *pGranularity) { pGranularity->width = 1; diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index e6994cc8539..4ef167c8efa 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -197,7 +197,7 @@ radv_pipeline_destroy(struct radv_device *device, struct radv_pipeline *pipeline vk_free2(&device->vk.alloc, allocator, pipeline); } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyPipeline(VkDevice _device, VkPipeline _pipeline, const VkAllocationCallbacks *pAllocator) { @@ -5652,7 +5652,7 @@ radv_graphics_pipeline_create(VkDevice _device, VkPipelineCache _cache, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateGraphicsPipelines(VkDevice _device, VkPipelineCache pipelineCache, uint32_t count, const VkGraphicsPipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) @@ -5834,7 +5834,7 @@ radv_compute_pipeline_create(VkDevice _device, VkPipelineCache _cache, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateComputePipelines(VkDevice _device, VkPipelineCache pipelineCache, uint32_t count, const VkComputePipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) @@ -5916,7 +5916,7 @@ desc_copy(char *desc, const char *src) memset(desc + len, 0, VK_MAX_DESCRIPTION_SIZE - len); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetPipelineExecutablePropertiesKHR(VkDevice _device, const VkPipelineInfoKHR *pPipelineInfo, uint32_t *pExecutableCount, VkPipelineExecutablePropertiesKHR *pProperties) @@ -6004,7 +6004,7 @@ radv_GetPipelineExecutablePropertiesKHR(VkDevice _device, const VkPipelineInfoKH return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetPipelineExecutableStatisticsKHR(VkDevice _device, const VkPipelineExecutableInfoKHR *pExecutableInfo, uint32_t *pStatisticCount, @@ -6131,7 +6131,7 @@ radv_copy_representation(void *data, size_t *data_size, const char *src) return size < total_size ? VK_INCOMPLETE : VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetPipelineExecutableInternalRepresentationsKHR( VkDevice device, const VkPipelineExecutableInfoKHR *pExecutableInfo, uint32_t *pInternalRepresentationCount, diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c index b6622c0f628..3ea369333c3 100644 --- a/src/amd/vulkan/radv_pipeline_cache.c +++ b/src/amd/vulkan/radv_pipeline_cache.c @@ -537,7 +537,7 @@ radv_pipeline_cache_load(struct radv_pipeline_cache *cache, const void *data, si return true; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreatePipelineCache(VkDevice _device, const VkPipelineCacheCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkPipelineCache *pPipelineCache) { @@ -568,7 +568,7 @@ radv_CreatePipelineCache(VkDevice _device, const VkPipelineCacheCreateInfo *pCre return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyPipelineCache(VkDevice _device, VkPipelineCache _cache, const VkAllocationCallbacks *pAllocator) { @@ -582,7 +582,7 @@ radv_DestroyPipelineCache(VkDevice _device, VkPipelineCache _cache, vk_free2(&device->vk.alloc, pAllocator, cache); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetPipelineCacheData(VkDevice _device, VkPipelineCache _cache, size_t *pDataSize, void *pData) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -648,7 +648,7 @@ radv_pipeline_cache_merge(struct radv_pipeline_cache *dst, struct radv_pipeline_ } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_MergePipelineCaches(VkDevice _device, VkPipelineCache destCache, uint32_t srcCacheCount, const VkPipelineCache *pSrcCaches) { diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c index bb9daf5caf5..35cede53448 100644 --- a/src/amd/vulkan/radv_pipeline_rt.c +++ b/src/amd/vulkan/radv_pipeline_rt.c @@ -2291,7 +2291,7 @@ fail: return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateRayTracingPipelinesKHR(VkDevice _device, VkDeferredOperationKHR deferredOperation, VkPipelineCache pipelineCache, uint32_t count, const VkRayTracingPipelineCreateInfoKHR *pCreateInfos, @@ -2319,7 +2319,7 @@ radv_CreateRayTracingPipelinesKHR(VkDevice _device, VkDeferredOperationKHR defer return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetRayTracingShaderGroupHandlesKHR(VkDevice device, VkPipeline _pipeline, uint32_t firstGroup, uint32_t groupCount, size_t dataSize, void *pData) { @@ -2338,7 +2338,7 @@ radv_GetRayTracingShaderGroupHandlesKHR(VkDevice device, VkPipeline _pipeline, u return VK_SUCCESS; } -VkDeviceSize +VKAPI_ATTR VkDeviceSize VKAPI_CALL radv_GetRayTracingShaderGroupStackSizeKHR(VkDevice device, VkPipeline _pipeline, uint32_t group, VkShaderGroupShaderKHR groupShader) { diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c index d6ee60ed896..aee8089b691 100644 --- a/src/amd/vulkan/radv_query.c +++ b/src/amd/vulkan/radv_query.c @@ -919,7 +919,7 @@ radv_destroy_query_pool(struct radv_device *device, const VkAllocationCallbacks vk_free2(&device->vk.alloc, pAllocator, pool); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateQueryPool(VkDevice _device, const VkQueryPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkQueryPool *pQueryPool) { @@ -976,7 +976,7 @@ radv_CreateQueryPool(VkDevice _device, const VkQueryPoolCreateInfo *pCreateInfo, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyQueryPool(VkDevice _device, VkQueryPool _pool, const VkAllocationCallbacks *pAllocator) { RADV_FROM_HANDLE(radv_device, device, _device); @@ -988,7 +988,7 @@ radv_DestroyQueryPool(VkDevice _device, VkQueryPool _pool, const VkAllocationCal radv_destroy_query_pool(device, pAllocator, pool); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetQueryPoolResults(VkDevice _device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, size_t dataSize, void *pData, VkDeviceSize stride, VkQueryResultFlags flags) @@ -1184,7 +1184,7 @@ emit_query_flush(struct radv_cmd_buffer *cmd_buffer, struct radv_query_pool *poo } } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdCopyQueryPoolResults(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize stride, VkQueryResultFlags flags) @@ -1314,7 +1314,7 @@ query_clear_value(VkQueryType type) } } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdResetQueryPool(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount) { @@ -1344,7 +1344,7 @@ radv_CmdResetQueryPool(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uin } } -void +VKAPI_ATTR void VKAPI_CALL radv_ResetQueryPool(VkDevice _device, VkQueryPool queryPool, uint32_t firstQuery, uint32_t queryCount) { @@ -1557,7 +1557,7 @@ emit_end_query(struct radv_cmd_buffer *cmd_buffer, struct radv_query_pool *pool, } } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdBeginQueryIndexedEXT(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags, uint32_t index) { @@ -1575,14 +1575,14 @@ radv_CmdBeginQueryIndexedEXT(VkCommandBuffer commandBuffer, VkQueryPool queryPoo emit_begin_query(cmd_buffer, pool, va, pool->type, flags, index); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdBeginQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, VkQueryControlFlags flags) { radv_CmdBeginQueryIndexedEXT(commandBuffer, queryPool, query, flags, 0); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdEndQueryIndexedEXT(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, uint32_t index) { @@ -1615,13 +1615,13 @@ radv_CmdEndQueryIndexedEXT(VkCommandBuffer commandBuffer, VkQueryPool queryPool, } } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query) { radv_CmdEndQueryIndexedEXT(commandBuffer, queryPool, query, 0); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdWriteTimestamp(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, uint32_t query) { @@ -1674,7 +1674,7 @@ radv_CmdWriteTimestamp(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pi assert(cmd_buffer->cs->cdw <= cdw_max); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdWriteAccelerationStructuresPropertiesKHR( VkCommandBuffer commandBuffer, uint32_t accelerationStructureCount, const VkAccelerationStructureKHR *pAccelerationStructures, VkQueryType queryType, diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 0f346626cb9..2e903ba4862 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -2168,7 +2168,7 @@ radv_compute_spi_ps_input(const struct radv_device *device, return spi_ps_input; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_GetShaderInfoAMD(VkDevice _device, VkPipeline _pipeline, VkShaderStageFlagBits shaderStage, VkShaderInfoTypeAMD infoType, size_t *pInfoSize, void *pInfo) { diff --git a/src/amd/vulkan/radv_wsi.c b/src/amd/vulkan/radv_wsi.c index 642bb9614d0..a8e79585969 100644 --- a/src/amd/vulkan/radv_wsi.c +++ b/src/amd/vulkan/radv_wsi.c @@ -29,7 +29,7 @@ #include "vk_util.h" #include "wsi_common.h" -static PFN_vkVoidFunction +static VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL radv_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName) { RADV_FROM_HANDLE(radv_physical_device, pdevice, physicalDevice); @@ -74,7 +74,7 @@ radv_finish_wsi(struct radv_physical_device *physical_device) wsi_device_finish(&physical_device->wsi_device, &physical_device->instance->vk.alloc); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_AcquireNextImage2KHR(VkDevice _device, const VkAcquireNextImageInfoKHR *pAcquireInfo, uint32_t *pImageIndex) { @@ -114,7 +114,7 @@ radv_AcquireNextImage2KHR(VkDevice _device, const VkAcquireNextImageInfoKHR *pAc return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_QueuePresentKHR(VkQueue _queue, const VkPresentInfoKHR *pPresentInfo) { RADV_FROM_HANDLE(radv_queue, queue, _queue);