From 1a773c000978ba1d79a0638bdbfbeeacc82ac353 Mon Sep 17 00:00:00 2001 From: Hyunjun Ko Date: Mon, 7 Jun 2021 04:59:32 +0000 Subject: [PATCH] turnip: add missing VKAPI_ATTR/CALL Signed-off-by: Hyunjun Ko Part-of: --- src/freedreno/vulkan/tu_android.c | 6 +- src/freedreno/vulkan/tu_clear_blit.c | 22 +-- src/freedreno/vulkan/tu_cmd_buffer.c | 178 ++++++++++++----------- src/freedreno/vulkan/tu_descriptor_set.c | 32 ++-- src/freedreno/vulkan/tu_device.c | 94 ++++++------ src/freedreno/vulkan/tu_drm.c | 38 ++--- src/freedreno/vulkan/tu_formats.c | 8 +- src/freedreno/vulkan/tu_image.c | 17 ++- src/freedreno/vulkan/tu_kgsl.c | 26 ++-- src/freedreno/vulkan/tu_legacy.c | 6 +- src/freedreno/vulkan/tu_pass.c | 6 +- src/freedreno/vulkan/tu_pipeline.c | 12 +- src/freedreno/vulkan/tu_pipeline_cache.c | 8 +- src/freedreno/vulkan/tu_query.c | 30 ++-- src/freedreno/vulkan/tu_wsi.c | 36 ++--- src/freedreno/vulkan/tu_wsi_display.c | 36 ++--- src/freedreno/vulkan/tu_wsi_wayland.c | 4 +- src/freedreno/vulkan/tu_wsi_x11.c | 12 +- 18 files changed, 291 insertions(+), 280 deletions(-) diff --git a/src/freedreno/vulkan/tu_android.c b/src/freedreno/vulkan/tu_android.c index 8ead7cc0a09..3c79dbd760c 100644 --- a/src/freedreno/vulkan/tu_android.c +++ b/src/freedreno/vulkan/tu_android.c @@ -329,7 +329,7 @@ setup_gralloc0_usage(struct tu_device *device, VkFormat format, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetSwapchainGrallocUsageANDROID(VkDevice device_h, VkFormat format, VkImageUsageFlags imageUsage, @@ -347,7 +347,7 @@ tu_GetSwapchainGrallocUsageANDROID(VkDevice device_h, } #if ANDROID_API_LEVEL >= 26 -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetSwapchainGrallocUsage2ANDROID(VkDevice device_h, VkFormat format, VkImageUsageFlags imageUsage, @@ -393,7 +393,7 @@ tu_GetSwapchainGrallocUsage2ANDROID(VkDevice device_h, } #endif -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_AcquireImageANDROID(VkDevice device, VkImage image_h, int nativeFenceFd, diff --git a/src/freedreno/vulkan/tu_clear_blit.c b/src/freedreno/vulkan/tu_clear_blit.c index 45d48479837..242a9d11b4b 100644 --- a/src/freedreno/vulkan/tu_clear_blit.c +++ b/src/freedreno/vulkan/tu_clear_blit.c @@ -1215,7 +1215,7 @@ tu6_blit_image(struct tu_cmd_buffer *cmd, ops->teardown(cmd, cs); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdBlitImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, @@ -1337,7 +1337,7 @@ tu_copy_buffer_to_image(struct tu_cmd_buffer *cmd, ops->teardown(cmd, cs); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdCopyBufferToImage(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkImage dstImage, @@ -1409,7 +1409,7 @@ tu_copy_image_to_buffer(struct tu_cmd_buffer *cmd, ops->teardown(cmd, cs); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdCopyImageToBuffer(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, @@ -1623,7 +1623,7 @@ tu_copy_image_to_image(struct tu_cmd_buffer *cmd, ops->teardown(cmd, cs); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdCopyImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, @@ -1683,7 +1683,7 @@ copy_buffer(struct tu_cmd_buffer *cmd, ops->teardown(cmd, cs); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdCopyBuffer(VkCommandBuffer commandBuffer, VkBuffer srcBuffer, VkBuffer dstBuffer, @@ -1702,7 +1702,7 @@ tu_CmdCopyBuffer(VkCommandBuffer commandBuffer, } } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdUpdateBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, @@ -1723,7 +1723,7 @@ tu_CmdUpdateBuffer(VkCommandBuffer commandBuffer, copy_buffer(cmd, tu_buffer_iova(buffer) + dstOffset, tmp.iova, dataSize, 4); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, @@ -1759,7 +1759,7 @@ tu_CmdFillBuffer(VkCommandBuffer commandBuffer, ops->teardown(cmd, cs); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdResolveImage(VkCommandBuffer commandBuffer, VkImage srcImage, VkImageLayout srcImageLayout, @@ -1912,7 +1912,7 @@ clear_image(struct tu_cmd_buffer *cmd, ops->teardown(cmd, cs); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdClearColorImage(VkCommandBuffer commandBuffer, VkImage image_h, VkImageLayout imageLayout, @@ -1927,7 +1927,7 @@ tu_CmdClearColorImage(VkCommandBuffer commandBuffer, clear_image(cmd, image, (const VkClearValue*) pColor, pRanges + i, VK_IMAGE_ASPECT_COLOR_BIT); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdClearDepthStencilImage(VkCommandBuffer commandBuffer, VkImage image_h, VkImageLayout imageLayout, @@ -2279,7 +2279,7 @@ tu_clear_gmem_attachments(struct tu_cmd_buffer *cmd, } } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdClearAttachments(VkCommandBuffer commandBuffer, uint32_t attachmentCount, const VkClearAttachment *pAttachments, diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index cef4215f474..9938105229e 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -1405,7 +1405,7 @@ tu_reset_cmd_buffer(struct tu_cmd_buffer *cmd_buffer) return cmd_buffer->record_result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_AllocateCommandBuffers(VkDevice _device, const VkCommandBufferAllocateInfo *pAllocateInfo, VkCommandBuffer *pCommandBuffers) @@ -1458,7 +1458,7 @@ tu_AllocateCommandBuffers(VkDevice _device, return result; } -void +VKAPI_ATTR void VKAPI_CALL tu_FreeCommandBuffers(VkDevice device, VkCommandPool commandPool, uint32_t commandBufferCount, @@ -1478,7 +1478,7 @@ tu_FreeCommandBuffers(VkDevice device, } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_ResetCommandBuffer(VkCommandBuffer commandBuffer, VkCommandBufferResetFlags flags) { @@ -1496,7 +1496,7 @@ tu_cache_init(struct tu_cache_state *cache) cache->pending_flush_bits = TU_CMD_FLAG_ALL_INVALIDATE; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_BeginCommandBuffer(VkCommandBuffer commandBuffer, const VkCommandBufferBeginInfo *pBeginInfo) { @@ -1564,7 +1564,7 @@ tu_BeginCommandBuffer(VkCommandBuffer commandBuffer, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdBindVertexBuffers(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, @@ -1575,7 +1575,7 @@ tu_CmdBindVertexBuffers(VkCommandBuffer commandBuffer, pBuffers, pOffsets, NULL, NULL); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdBindVertexBuffers2EXT(VkCommandBuffer commandBuffer, uint32_t firstBinding, uint32_t bindingCount, @@ -1622,7 +1622,7 @@ tu_CmdBindVertexBuffers2EXT(VkCommandBuffer commandBuffer, } } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdBindIndexBuffer(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset, @@ -1666,7 +1666,7 @@ tu_CmdBindIndexBuffer(VkCommandBuffer commandBuffer, cmd->state.index_size = index_size; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdBindDescriptorSets(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout _layout, @@ -1784,12 +1784,13 @@ tu_CmdBindDescriptorSets(VkCommandBuffer commandBuffer, } } -void tu_CmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer, - VkPipelineBindPoint pipelineBindPoint, - VkPipelineLayout _layout, - uint32_t _set, - uint32_t descriptorWriteCount, - const VkWriteDescriptorSet *pDescriptorWrites) +VKAPI_ATTR void VKAPI_CALL +tu_CmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer, + VkPipelineBindPoint pipelineBindPoint, + VkPipelineLayout _layout, + uint32_t _set, + uint32_t descriptorWriteCount, + const VkWriteDescriptorSet *pDescriptorWrites) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); TU_FROM_HANDLE(tu_pipeline_layout, pipe_layout, _layout); @@ -1822,12 +1823,12 @@ void tu_CmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer, 0, NULL); } -void tu_CmdPushDescriptorSetWithTemplateKHR( - VkCommandBuffer commandBuffer, - VkDescriptorUpdateTemplate descriptorUpdateTemplate, - VkPipelineLayout _layout, - uint32_t _set, - const void* pData) +VKAPI_ATTR void VKAPI_CALL +tu_CmdPushDescriptorSetWithTemplateKHR(VkCommandBuffer commandBuffer, + VkDescriptorUpdateTemplate descriptorUpdateTemplate, + VkPipelineLayout _layout, + uint32_t _set, + const void* pData) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); TU_FROM_HANDLE(tu_pipeline_layout, pipe_layout, _layout); @@ -1860,12 +1861,13 @@ void tu_CmdPushDescriptorSetWithTemplateKHR( 0, NULL); } -void tu_CmdBindTransformFeedbackBuffersEXT(VkCommandBuffer commandBuffer, - uint32_t firstBinding, - uint32_t bindingCount, - const VkBuffer *pBuffers, - const VkDeviceSize *pOffsets, - const VkDeviceSize *pSizes) +VKAPI_ATTR void VKAPI_CALL +tu_CmdBindTransformFeedbackBuffersEXT(VkCommandBuffer commandBuffer, + uint32_t firstBinding, + uint32_t bindingCount, + const VkBuffer *pBuffers, + const VkDeviceSize *pOffsets, + const VkDeviceSize *pSizes) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); struct tu_cs *cs = &cmd->draw_cs; @@ -1901,7 +1903,7 @@ void tu_CmdBindTransformFeedbackBuffersEXT(VkCommandBuffer commandBuffer, tu_cond_exec_end(cs); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdBeginTransformFeedbackEXT(VkCommandBuffer commandBuffer, uint32_t firstCounterBuffer, uint32_t counterBufferCount, @@ -1947,11 +1949,12 @@ tu_CmdBeginTransformFeedbackEXT(VkCommandBuffer commandBuffer, tu_cond_exec_end(cs); } -void tu_CmdEndTransformFeedbackEXT(VkCommandBuffer commandBuffer, - uint32_t firstCounterBuffer, - uint32_t counterBufferCount, - const VkBuffer *pCounterBuffers, - const VkDeviceSize *pCounterBufferOffsets) +VKAPI_ATTR void VKAPI_CALL +tu_CmdEndTransformFeedbackEXT(VkCommandBuffer commandBuffer, + uint32_t firstCounterBuffer, + uint32_t counterBufferCount, + const VkBuffer *pCounterBuffers, + const VkDeviceSize *pCounterBufferOffsets) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); struct tu_cs *cs = &cmd->draw_cs; @@ -2006,7 +2009,7 @@ void tu_CmdEndTransformFeedbackEXT(VkCommandBuffer commandBuffer, cmd->state.xfb_used = true; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, @@ -2029,7 +2032,7 @@ tu_flush_all_pending(struct tu_cache_state *cache) cache->pending_flush_bits &= ~TU_CMD_FLAG_ALL_FLUSH; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_EndCommandBuffer(VkCommandBuffer commandBuffer) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); @@ -2086,7 +2089,7 @@ tu_cmd_dynamic_state(struct tu_cmd_buffer *cmd, uint32_t id, uint32_t size) return cs; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline _pipeline) @@ -2168,7 +2171,7 @@ tu_CmdBindPipeline(VkCommandBuffer commandBuffer, cmd->state.dirty |= TU_CMD_DIRTY_RB_DEPTH_CNTL; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetViewport(VkCommandBuffer commandBuffer, uint32_t firstViewport, uint32_t viewportCount, @@ -2184,7 +2187,7 @@ tu_CmdSetViewport(VkCommandBuffer commandBuffer, tu6_emit_viewport(&cs, cmd->state.viewport, cmd->state.max_viewport); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetScissor(VkCommandBuffer commandBuffer, uint32_t firstScissor, uint32_t scissorCount, @@ -2200,7 +2203,7 @@ tu_CmdSetScissor(VkCommandBuffer commandBuffer, tu6_emit_scissor(&cs, cmd->state.scissor, cmd->state.max_scissor); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); @@ -2211,7 +2214,7 @@ tu_CmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) cmd->state.dirty |= TU_CMD_DIRTY_GRAS_SU_CNTL; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetDepthBias(VkCommandBuffer commandBuffer, float depthBiasConstantFactor, float depthBiasClamp, @@ -2223,7 +2226,7 @@ tu_CmdSetDepthBias(VkCommandBuffer commandBuffer, tu6_emit_depth_bias(&cs, depthBiasConstantFactor, depthBiasClamp, depthBiasSlopeFactor); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetBlendConstants(VkCommandBuffer commandBuffer, const float blendConstants[4]) { @@ -2234,7 +2237,7 @@ tu_CmdSetBlendConstants(VkCommandBuffer commandBuffer, tu_cs_emit_array(&cs, (const uint32_t *) blendConstants, 4); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetDepthBounds(VkCommandBuffer commandBuffer, float minDepthBounds, float maxDepthBounds) @@ -2256,7 +2259,7 @@ update_stencil_mask(uint32_t *value, VkStencilFaceFlags face, uint32_t mask) *value = (*value & 0xff) | (mask & 0xff) << 8; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetStencilCompareMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t compareMask) @@ -2269,7 +2272,7 @@ tu_CmdSetStencilCompareMask(VkCommandBuffer commandBuffer, tu_cs_emit_regs(&cs, A6XX_RB_STENCILMASK(.dword = cmd->state.dynamic_stencil_mask)); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetStencilWriteMask(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t writeMask) @@ -2284,7 +2287,7 @@ tu_CmdSetStencilWriteMask(VkCommandBuffer commandBuffer, cmd->state.dirty |= TU_CMD_DIRTY_LRZ; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetStencilReference(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, uint32_t reference) @@ -2297,7 +2300,7 @@ tu_CmdSetStencilReference(VkCommandBuffer commandBuffer, tu_cs_emit_regs(&cs, A6XX_RB_STENCILREF(.dword = cmd->state.dynamic_stencil_ref)); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetSampleLocationsEXT(VkCommandBuffer commandBuffer, const VkSampleLocationsInfoEXT* pSampleLocationsInfo) { @@ -2309,7 +2312,7 @@ tu_CmdSetSampleLocationsEXT(VkCommandBuffer commandBuffer, tu6_emit_sample_locations(&cs, pSampleLocationsInfo); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetCullModeEXT(VkCommandBuffer commandBuffer, VkCullModeFlags cullMode) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); @@ -2325,7 +2328,7 @@ tu_CmdSetCullModeEXT(VkCommandBuffer commandBuffer, VkCullModeFlags cullMode) cmd->state.dirty |= TU_CMD_DIRTY_GRAS_SU_CNTL; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetFrontFaceEXT(VkCommandBuffer commandBuffer, VkFrontFace frontFace) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); @@ -2338,7 +2341,7 @@ tu_CmdSetFrontFaceEXT(VkCommandBuffer commandBuffer, VkFrontFace frontFace) cmd->state.dirty |= TU_CMD_DIRTY_GRAS_SU_CNTL; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetPrimitiveTopologyEXT(VkCommandBuffer commandBuffer, VkPrimitiveTopology primitiveTopology) { @@ -2347,7 +2350,7 @@ tu_CmdSetPrimitiveTopologyEXT(VkCommandBuffer commandBuffer, cmd->state.primtype = tu6_primtype(primitiveTopology); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetViewportWithCountEXT(VkCommandBuffer commandBuffer, uint32_t viewportCount, const VkViewport* pViewports) @@ -2355,7 +2358,7 @@ tu_CmdSetViewportWithCountEXT(VkCommandBuffer commandBuffer, tu_CmdSetViewport(commandBuffer, 0, viewportCount, pViewports); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetScissorWithCountEXT(VkCommandBuffer commandBuffer, uint32_t scissorCount, const VkRect2D* pScissors) @@ -2363,7 +2366,7 @@ tu_CmdSetScissorWithCountEXT(VkCommandBuffer commandBuffer, tu_CmdSetScissor(commandBuffer, 0, scissorCount, pScissors); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetDepthTestEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthTestEnable) { @@ -2377,7 +2380,7 @@ tu_CmdSetDepthTestEnableEXT(VkCommandBuffer commandBuffer, cmd->state.dirty |= TU_CMD_DIRTY_RB_DEPTH_CNTL; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetDepthWriteEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthWriteEnable) { @@ -2391,7 +2394,7 @@ tu_CmdSetDepthWriteEnableEXT(VkCommandBuffer commandBuffer, cmd->state.dirty |= TU_CMD_DIRTY_RB_DEPTH_CNTL; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetDepthCompareOpEXT(VkCommandBuffer commandBuffer, VkCompareOp depthCompareOp) { @@ -2405,7 +2408,7 @@ tu_CmdSetDepthCompareOpEXT(VkCommandBuffer commandBuffer, cmd->state.dirty |= TU_CMD_DIRTY_RB_DEPTH_CNTL; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetDepthBoundsTestEnableEXT(VkCommandBuffer commandBuffer, VkBool32 depthBoundsTestEnable) { @@ -2419,7 +2422,7 @@ tu_CmdSetDepthBoundsTestEnableEXT(VkCommandBuffer commandBuffer, cmd->state.dirty |= TU_CMD_DIRTY_RB_DEPTH_CNTL; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetStencilTestEnableEXT(VkCommandBuffer commandBuffer, VkBool32 stencilTestEnable) { @@ -2440,7 +2443,7 @@ tu_CmdSetStencilTestEnableEXT(VkCommandBuffer commandBuffer, cmd->state.dirty |= TU_CMD_DIRTY_RB_STENCIL_CNTL; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetStencilOpEXT(VkCommandBuffer commandBuffer, VkStencilFaceFlags faceMask, VkStencilOp failOp, @@ -2733,7 +2736,7 @@ vk2tu_access(VkAccessFlags flags, bool gmem) } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer *pCmdBuffers) @@ -2806,7 +2809,7 @@ tu_CmdExecuteCommands(VkCommandBuffer commandBuffer, } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateCommandPool(VkDevice _device, const VkCommandPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -2835,7 +2838,7 @@ tu_CreateCommandPool(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyCommandPool(VkDevice _device, VkCommandPool commandPool, const VkAllocationCallbacks *pAllocator) @@ -2861,7 +2864,7 @@ tu_DestroyCommandPool(VkDevice _device, vk_object_free(&device->vk, pAllocator, pool); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_ResetCommandPool(VkDevice device, VkCommandPool commandPool, VkCommandPoolResetFlags flags) @@ -2880,7 +2883,7 @@ tu_ResetCommandPool(VkDevice device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_TrimCommandPool(VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags) @@ -2920,7 +2923,7 @@ tu_subpass_barrier(struct tu_cmd_buffer *cmd_buffer, tu_flush_for_access(cache, src_flags, dst_flags); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdBeginRenderPass2(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *pRenderPassBegin, const VkSubpassBeginInfo *pSubpassBeginInfo) @@ -2976,7 +2979,7 @@ tu_CmdBeginRenderPass2(VkCommandBuffer commandBuffer, tu_set_input_attachments(cmd, cmd->state.subpass); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdNextSubpass2(VkCommandBuffer commandBuffer, const VkSubpassBeginInfo *pSubpassBeginInfo, const VkSubpassEndInfo *pSubpassEndInfo) @@ -3880,7 +3883,7 @@ tu6_emit_vs_params(struct tu_cmd_buffer *cmd, return (struct tu_draw_state) {entry.bo->iova + entry.offset, entry.size / 4}; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdDraw(VkCommandBuffer commandBuffer, uint32_t vertexCount, uint32_t instanceCount, @@ -3900,7 +3903,7 @@ tu_CmdDraw(VkCommandBuffer commandBuffer, tu_cs_emit(cs, vertexCount); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdDrawIndexed(VkCommandBuffer commandBuffer, uint32_t indexCount, uint32_t instanceCount, @@ -3938,7 +3941,7 @@ draw_wfm(struct tu_cmd_buffer *cmd) cmd->state.renderpass_cache.pending_flush_bits &= ~TU_CMD_FLAG_WAIT_FOR_ME; } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdDrawIndirect(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset, @@ -3972,7 +3975,7 @@ tu_CmdDrawIndirect(VkCommandBuffer commandBuffer, tu_cs_emit(cs, stride); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset, @@ -4001,7 +4004,7 @@ tu_CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, tu_cs_emit(cs, stride); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdDrawIndirectCount(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset, @@ -4036,7 +4039,7 @@ tu_CmdDrawIndirectCount(VkCommandBuffer commandBuffer, tu_cs_emit(cs, stride); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdDrawIndexedIndirectCount(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset, @@ -4068,13 +4071,14 @@ tu_CmdDrawIndexedIndirectCount(VkCommandBuffer commandBuffer, tu_cs_emit(cs, stride); } -void tu_CmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuffer, - uint32_t instanceCount, - uint32_t firstInstance, - VkBuffer _counterBuffer, - VkDeviceSize counterBufferOffset, - uint32_t counterOffset, - uint32_t vertexStride) +VKAPI_ATTR void VKAPI_CALL +tu_CmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuffer, + uint32_t instanceCount, + uint32_t firstInstance, + VkBuffer _counterBuffer, + VkDeviceSize counterBufferOffset, + uint32_t counterOffset, + uint32_t vertexStride) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); TU_FROM_HANDLE(tu_buffer, buf, _counterBuffer); @@ -4282,7 +4286,7 @@ tu_dispatch(struct tu_cmd_buffer *cmd, tu_cs_emit_wfi(cs); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdDispatchBase(VkCommandBuffer commandBuffer, uint32_t base_x, uint32_t base_y, @@ -4304,7 +4308,7 @@ tu_CmdDispatchBase(VkCommandBuffer commandBuffer, tu_dispatch(cmd_buffer, &info); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdDispatch(VkCommandBuffer commandBuffer, uint32_t x, uint32_t y, @@ -4313,7 +4317,7 @@ tu_CmdDispatch(VkCommandBuffer commandBuffer, tu_CmdDispatchBase(commandBuffer, 0, 0, 0, x, y, z); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdDispatchIndirect(VkCommandBuffer commandBuffer, VkBuffer _buffer, VkDeviceSize offset) @@ -4328,7 +4332,7 @@ tu_CmdDispatchIndirect(VkCommandBuffer commandBuffer, tu_dispatch(cmd_buffer, &info); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdEndRenderPass2(VkCommandBuffer commandBuffer, const VkSubpassEndInfoKHR *pSubpassEndInfo) { @@ -4446,7 +4450,7 @@ tu_barrier(struct tu_cmd_buffer *cmd, } } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdPipelineBarrier(VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask, @@ -4501,7 +4505,7 @@ write_event(struct tu_cmd_buffer *cmd, struct tu_event *event, } } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetEvent(VkCommandBuffer commandBuffer, VkEvent _event, VkPipelineStageFlags stageMask) @@ -4512,7 +4516,7 @@ tu_CmdSetEvent(VkCommandBuffer commandBuffer, write_event(cmd, event, stageMask, 1); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdResetEvent(VkCommandBuffer commandBuffer, VkEvent _event, VkPipelineStageFlags stageMask) @@ -4523,7 +4527,7 @@ tu_CmdResetEvent(VkCommandBuffer commandBuffer, write_event(cmd, event, stageMask, 0); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdWaitEvents(VkCommandBuffer commandBuffer, uint32_t eventCount, const VkEvent *pEvents, @@ -4548,14 +4552,14 @@ tu_CmdWaitEvents(VkCommandBuffer commandBuffer, imageMemoryBarrierCount, pImageMemoryBarriers, &info); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdSetDeviceMask(VkCommandBuffer commandBuffer, uint32_t deviceMask) { /* No-op */ } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdBeginConditionalRenderingEXT(VkCommandBuffer commandBuffer, const VkConditionalRenderingBeginInfoEXT *pConditionalRenderingBegin) { @@ -4599,7 +4603,7 @@ tu_CmdBeginConditionalRenderingEXT(VkCommandBuffer commandBuffer, tu_cs_emit_qw(cs, global_iova(cmd, predicate)); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdEndConditionalRenderingEXT(VkCommandBuffer commandBuffer) { TU_FROM_HANDLE(tu_cmd_buffer, cmd, commandBuffer); diff --git a/src/freedreno/vulkan/tu_descriptor_set.c b/src/freedreno/vulkan/tu_descriptor_set.c index 04f3673b1bb..8081075e446 100644 --- a/src/freedreno/vulkan/tu_descriptor_set.c +++ b/src/freedreno/vulkan/tu_descriptor_set.c @@ -73,7 +73,7 @@ descriptor_size(VkDescriptorType type) } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateDescriptorSetLayout( VkDevice _device, const VkDescriptorSetLayoutCreateInfo *pCreateInfo, @@ -228,7 +228,7 @@ tu_CreateDescriptorSetLayout( return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyDescriptorSetLayout(VkDevice _device, VkDescriptorSetLayout _set_layout, const VkAllocationCallbacks *pAllocator) @@ -242,7 +242,7 @@ tu_DestroyDescriptorSetLayout(VkDevice _device, vk_object_free(&device->vk, pAllocator, set_layout); } -void +VKAPI_ATTR void VKAPI_CALL tu_GetDescriptorSetLayoutSupport( VkDevice device, const VkDescriptorSetLayoutCreateInfo *pCreateInfo, @@ -308,7 +308,7 @@ tu_GetDescriptorSetLayoutSupport( * just multiple descriptor set layouts pasted together. */ -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreatePipelineLayout(VkDevice _device, const VkPipelineLayoutCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -353,7 +353,7 @@ tu_CreatePipelineLayout(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyPipelineLayout(VkDevice _device, VkPipelineLayout _pipelineLayout, const VkAllocationCallbacks *pAllocator) @@ -507,7 +507,7 @@ tu_descriptor_set_destroy(struct tu_device *device, vk_object_free(&device->vk, NULL, set); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateDescriptorPool(VkDevice _device, const VkDescriptorPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -578,7 +578,7 @@ fail_alloc: return ret; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyDescriptorPool(VkDevice _device, VkDescriptorPool _pool, const VkAllocationCallbacks *pAllocator) @@ -601,7 +601,7 @@ tu_DestroyDescriptorPool(VkDevice _device, vk_object_free(&device->vk, pAllocator, pool); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_ResetDescriptorPool(VkDevice _device, VkDescriptorPool descriptorPool, VkDescriptorPoolResetFlags flags) @@ -622,7 +622,7 @@ tu_ResetDescriptorPool(VkDevice _device, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_AllocateDescriptorSets(VkDevice _device, const VkDescriptorSetAllocateInfo *pAllocateInfo, VkDescriptorSet *pDescriptorSets) @@ -670,7 +670,7 @@ tu_AllocateDescriptorSets(VkDevice _device, return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_FreeDescriptorSets(VkDevice _device, VkDescriptorPool descriptorPool, uint32_t count, @@ -936,7 +936,7 @@ tu_update_descriptor_sets(const struct tu_device *device, } } -void +VKAPI_ATTR void VKAPI_CALL tu_UpdateDescriptorSets(VkDevice _device, uint32_t descriptorWriteCount, const VkWriteDescriptorSet *pDescriptorWrites, @@ -949,7 +949,7 @@ tu_UpdateDescriptorSets(VkDevice _device, descriptorCopyCount, pDescriptorCopies); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateDescriptorUpdateTemplate( VkDevice _device, const VkDescriptorUpdateTemplateCreateInfo *pCreateInfo, @@ -1034,7 +1034,7 @@ tu_CreateDescriptorUpdateTemplate( return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyDescriptorUpdateTemplate( VkDevice _device, VkDescriptorUpdateTemplate descriptorUpdateTemplate, @@ -1122,7 +1122,7 @@ tu_update_descriptor_set_with_template( } } -void +VKAPI_ATTR void VKAPI_CALL tu_UpdateDescriptorSetWithTemplate( VkDevice _device, VkDescriptorSet descriptorSet, @@ -1135,7 +1135,7 @@ tu_UpdateDescriptorSetWithTemplate( tu_update_descriptor_set_with_template(device, set, descriptorUpdateTemplate, pData); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateSamplerYcbcrConversion( VkDevice _device, const VkSamplerYcbcrConversionCreateInfo *pCreateInfo, @@ -1162,7 +1162,7 @@ tu_CreateSamplerYcbcrConversion( return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroySamplerYcbcrConversion(VkDevice _device, VkSamplerYcbcrConversion ycbcrConversion, const VkAllocationCallbacks *pAllocator) diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c index 04801cb77bf..865c2bf2c57 100644 --- a/src/freedreno/vulkan/tu_device.c +++ b/src/freedreno/vulkan/tu_device.c @@ -72,7 +72,8 @@ tu_device_get_cache_uuid(uint16_t family, void *uuid) #define TU_API_VERSION VK_MAKE_VERSION(1, 1, VK_HEADER_VERSION) -VkResult tu_EnumerateInstanceVersion(uint32_t *pApiVersion) +VKAPI_ATTR VkResult VKAPI_CALL +tu_EnumerateInstanceVersion(uint32_t *pApiVersion) { *pApiVersion = TU_API_VERSION; return VK_SUCCESS; @@ -293,7 +294,7 @@ tu_get_debug_option_name(int id) return tu_debug_options[id].string; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkInstance *pInstance) @@ -348,7 +349,7 @@ tu_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyInstance(VkInstance _instance, const VkAllocationCallbacks *pAllocator) { @@ -367,7 +368,7 @@ tu_DestroyInstance(VkInstance _instance, vk_free(&instance->vk.alloc, instance); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_EnumeratePhysicalDevices(VkInstance _instance, uint32_t *pPhysicalDeviceCount, VkPhysicalDevice *pPhysicalDevices) @@ -393,7 +394,7 @@ tu_EnumeratePhysicalDevices(VkInstance _instance, return vk_outarray_status(&out); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_EnumeratePhysicalDeviceGroups( VkInstance _instance, uint32_t *pPhysicalDeviceGroupCount, @@ -423,7 +424,7 @@ tu_EnumeratePhysicalDeviceGroups( return vk_outarray_status(&out); } -void +VKAPI_ATTR void VKAPI_CALL tu_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceFeatures2 *pFeatures) { @@ -749,7 +750,7 @@ tu_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice, } } -void +VKAPI_ATTR void VKAPI_CALL tu_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) { @@ -1088,7 +1089,7 @@ static const VkQueueFamilyProperties tu_queue_family_properties = { .minImageTransferGranularity = { 1, 1, 1 }, }; -void +VKAPI_ATTR void VKAPI_CALL tu_GetPhysicalDeviceQueueFamilyProperties2( VkPhysicalDevice physicalDevice, uint32_t *pQueueFamilyPropertyCount, @@ -1140,7 +1141,7 @@ tu_get_budget_memory(struct tu_physical_device *physical_device) return MIN2(heap_size, heap_used + heap_available); } -void +VKAPI_ATTR void VKAPI_CALL tu_GetPhysicalDeviceMemoryProperties2(VkPhysicalDevice pdev, VkPhysicalDeviceMemoryProperties2 *props2) { @@ -1217,7 +1218,7 @@ tu_queue_finish(struct tu_queue *queue) tu_drm_submitqueue_close(queue->device, queue->msm_queue_id); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -1482,7 +1483,7 @@ fail_queues: return result; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyDevice(VkDevice _device, const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); @@ -1587,7 +1588,7 @@ tu_get_scratch_bo(struct tu_device *dev, uint64_t size, struct tu_bo **bo) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_EnumerateInstanceLayerProperties(uint32_t *pPropertyCount, VkLayerProperties *pProperties) { @@ -1595,7 +1596,7 @@ tu_EnumerateInstanceLayerProperties(uint32_t *pPropertyCount, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_GetDeviceQueue2(VkDevice _device, const VkDeviceQueueInfo2 *pQueueInfo, VkQueue *pQueue) @@ -1621,7 +1622,7 @@ tu_GetDeviceQueue2(VkDevice _device, *pQueue = tu_queue_to_handle(queue); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_QueueWaitIdle(VkQueue _queue) { TU_FROM_HANDLE(tu_queue, queue, _queue); @@ -1660,7 +1661,7 @@ tu_QueueWaitIdle(VkQueue _queue) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_DeviceWaitIdle(VkDevice _device) { TU_FROM_HANDLE(tu_device, device, _device); @@ -1676,7 +1677,7 @@ tu_DeviceWaitIdle(VkDevice _device) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_EnumerateInstanceExtensionProperties(const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties) @@ -1688,7 +1689,7 @@ tu_EnumerateInstanceExtensionProperties(const char *pLayerName, &tu_instance_extensions_supported, pPropertyCount, pProperties); } -PFN_vkVoidFunction +VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL tu_GetInstanceProcAddr(VkInstance _instance, const char *pName) { TU_FROM_HANDLE(tu_instance, instance, _instance); @@ -1711,7 +1712,7 @@ vk_icdGetInstanceProcAddr(VkInstance instance, const char *pName) return tu_GetInstanceProcAddr(instance, pName); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_AllocateMemory(VkDevice _device, const VkMemoryAllocateInfo *pAllocateInfo, const VkAllocationCallbacks *pAllocator, @@ -1788,7 +1789,7 @@ tu_AllocateMemory(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_FreeMemory(VkDevice _device, VkDeviceMemory _mem, const VkAllocationCallbacks *pAllocator) @@ -1804,7 +1805,7 @@ tu_FreeMemory(VkDevice _device, vk_object_free(&device->vk, pAllocator, mem); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_MapMemory(VkDevice _device, VkDeviceMemory _memory, VkDeviceSize offset, @@ -1831,13 +1832,13 @@ tu_MapMemory(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_UnmapMemory(VkDevice _device, VkDeviceMemory _memory) { /* TODO: unmap here instead of waiting for FreeMemory */ } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_FlushMappedMemoryRanges(VkDevice _device, uint32_t memoryRangeCount, const VkMappedMemoryRange *pMemoryRanges) @@ -1845,7 +1846,7 @@ tu_FlushMappedMemoryRanges(VkDevice _device, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_InvalidateMappedMemoryRanges(VkDevice _device, uint32_t memoryRangeCount, const VkMappedMemoryRange *pMemoryRanges) @@ -1853,7 +1854,7 @@ tu_InvalidateMappedMemoryRanges(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_GetBufferMemoryRequirements2( VkDevice device, const VkBufferMemoryRequirementsInfo2 *pInfo, @@ -1882,7 +1883,7 @@ tu_GetBufferMemoryRequirements2( } } -void +VKAPI_ATTR void VKAPI_CALL tu_GetImageMemoryRequirements2(VkDevice device, const VkImageMemoryRequirementsInfo2 *pInfo, VkMemoryRequirements2 *pMemoryRequirements) @@ -1910,7 +1911,7 @@ tu_GetImageMemoryRequirements2(VkDevice device, } } -void +VKAPI_ATTR void VKAPI_CALL tu_GetImageSparseMemoryRequirements2( VkDevice device, const VkImageSparseMemoryRequirementsInfo2 *pInfo, @@ -1920,7 +1921,7 @@ tu_GetImageSparseMemoryRequirements2( tu_stub(); } -void +VKAPI_ATTR void VKAPI_CALL tu_GetDeviceMemoryCommitment(VkDevice device, VkDeviceMemory memory, VkDeviceSize *pCommittedMemoryInBytes) @@ -1928,7 +1929,7 @@ tu_GetDeviceMemoryCommitment(VkDevice device, *pCommittedMemoryInBytes = 0; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_BindBufferMemory2(VkDevice device, uint32_t bindInfoCount, const VkBindBufferMemoryInfo *pBindInfos) @@ -1947,7 +1948,7 @@ tu_BindBufferMemory2(VkDevice device, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_BindImageMemory2(VkDevice device, uint32_t bindInfoCount, const VkBindImageMemoryInfo *pBindInfos) @@ -1968,7 +1969,7 @@ tu_BindImageMemory2(VkDevice device, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_QueueBindSparse(VkQueue _queue, uint32_t bindInfoCount, const VkBindSparseInfo *pBindInfo, @@ -1977,7 +1978,7 @@ tu_QueueBindSparse(VkQueue _queue, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateEvent(VkDevice _device, const VkEventCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -2011,7 +2012,7 @@ fail_alloc: return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY); } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyEvent(VkDevice _device, VkEvent _event, const VkAllocationCallbacks *pAllocator) @@ -2026,7 +2027,7 @@ tu_DestroyEvent(VkDevice _device, vk_object_free(&device->vk, pAllocator, event); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetEventStatus(VkDevice _device, VkEvent _event) { TU_FROM_HANDLE(tu_event, event, _event); @@ -2036,7 +2037,7 @@ tu_GetEventStatus(VkDevice _device, VkEvent _event) return VK_EVENT_RESET; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_SetEvent(VkDevice _device, VkEvent _event) { TU_FROM_HANDLE(tu_event, event, _event); @@ -2045,7 +2046,7 @@ tu_SetEvent(VkDevice _device, VkEvent _event) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_ResetEvent(VkDevice _device, VkEvent _event) { TU_FROM_HANDLE(tu_event, event, _event); @@ -2054,7 +2055,7 @@ tu_ResetEvent(VkDevice _device, VkEvent _event) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateBuffer(VkDevice _device, const VkBufferCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -2079,7 +2080,7 @@ tu_CreateBuffer(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyBuffer(VkDevice _device, VkBuffer _buffer, const VkAllocationCallbacks *pAllocator) @@ -2093,7 +2094,7 @@ tu_DestroyBuffer(VkDevice _device, vk_object_free(&device->vk, pAllocator, buffer); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateFramebuffer(VkDevice _device, const VkFramebufferCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -2128,7 +2129,7 @@ tu_CreateFramebuffer(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyFramebuffer(VkDevice _device, VkFramebuffer _fb, const VkAllocationCallbacks *pAllocator) @@ -2213,7 +2214,7 @@ tu_init_sampler(struct tu_device *device, */ } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateSampler(VkDevice _device, const VkSamplerCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -2235,7 +2236,7 @@ tu_CreateSampler(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroySampler(VkDevice _device, VkSampler _sampler, const VkAllocationCallbacks *pAllocator) @@ -2305,7 +2306,7 @@ vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *pSupportedVersion) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetMemoryFdKHR(VkDevice _device, const VkMemoryGetFdInfoKHR *pGetFdInfo, int *pFd) @@ -2329,7 +2330,7 @@ tu_GetMemoryFdKHR(VkDevice _device, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetMemoryFdPropertiesKHR(VkDevice _device, VkExternalMemoryHandleTypeFlagBits handleType, int fd, @@ -2340,7 +2341,7 @@ tu_GetMemoryFdPropertiesKHR(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_GetPhysicalDeviceExternalFenceProperties( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalFenceInfo *pExternalFenceInfo, @@ -2351,7 +2352,7 @@ tu_GetPhysicalDeviceExternalFenceProperties( pExternalFenceProperties->externalFenceFeatures = 0; } -void +VKAPI_ATTR void VKAPI_CALL tu_GetDeviceGroupPeerMemoryFeatures( VkDevice device, uint32_t heapIndex, @@ -2367,7 +2368,8 @@ tu_GetDeviceGroupPeerMemoryFeatures( VK_PEER_MEMORY_FEATURE_GENERIC_DST_BIT; } -void tu_GetPhysicalDeviceMultisamplePropertiesEXT( +VKAPI_ATTR void VKAPI_CALL +tu_GetPhysicalDeviceMultisamplePropertiesEXT( VkPhysicalDevice physicalDevice, VkSampleCountFlagBits samples, VkMultisamplePropertiesEXT* pMultisampleProperties) diff --git a/src/freedreno/vulkan/tu_drm.c b/src/freedreno/vulkan/tu_drm.c index 08dffeac5f7..839956a6eca 100644 --- a/src/freedreno/vulkan/tu_drm.c +++ b/src/freedreno/vulkan/tu_drm.c @@ -700,7 +700,7 @@ get_semaphore_type(const void *pNext, uint64_t *initial_value) return type_info->semaphoreType; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateSemaphore(VkDevice device, const VkSemaphoreCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -713,14 +713,14 @@ tu_CreateSemaphore(VkDevice device, timeline_value, pAllocator, (void**) pSemaphore); } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroySemaphore(VkDevice device, VkSemaphore sem, const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_syncobj, sync, sem); sync_destroy(device, sync, pAllocator); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_ImportSemaphoreFdKHR(VkDevice device, const VkImportSemaphoreFdInfoKHR *info) { TU_FROM_HANDLE(tu_syncobj, sync, info->semaphore); @@ -728,7 +728,7 @@ tu_ImportSemaphoreFdKHR(VkDevice device, const VkImportSemaphoreFdInfoKHR *info) info->handleType == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT, info->fd); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetSemaphoreFdKHR(VkDevice device, const VkSemaphoreGetFdInfoKHR *info, int *pFd) { TU_FROM_HANDLE(tu_syncobj, sync, info->semaphore); @@ -736,7 +736,7 @@ tu_GetSemaphoreFdKHR(VkDevice device, const VkSemaphoreGetFdInfoKHR *info, int * info->handleType == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT, pFd); } -void +VKAPI_ATTR void VKAPI_CALL tu_GetPhysicalDeviceExternalSemaphoreProperties( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo, @@ -1165,7 +1165,7 @@ tu_device_submit_deferred_locked(struct tu_device *dev) return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_QueueSubmit(VkQueue _queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, @@ -1298,7 +1298,7 @@ tu_QueueSubmit(VkQueue _queue, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateFence(VkDevice device, const VkFenceCreateInfo *info, const VkAllocationCallbacks *pAllocator, @@ -1308,14 +1308,14 @@ tu_CreateFence(VkDevice device, pAllocator, (void**) pFence); } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyFence(VkDevice device, VkFence fence, const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_syncobj, sync, fence); sync_destroy(device, sync, pAllocator); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_ImportFenceFdKHR(VkDevice device, const VkImportFenceFdInfoKHR *info) { TU_FROM_HANDLE(tu_syncobj, sync, info->fence); @@ -1323,7 +1323,7 @@ tu_ImportFenceFdKHR(VkDevice device, const VkImportFenceFdInfoKHR *info) info->handleType == VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT, info->fd); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetFenceFdKHR(VkDevice device, const VkFenceGetFdInfoKHR *info, int *pFd) { TU_FROM_HANDLE(tu_syncobj, sync, info->fence); @@ -1375,7 +1375,7 @@ absolute_timeout(uint64_t timeout) return (current_time + timeout); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_WaitForFences(VkDevice _device, uint32_t fenceCount, const VkFence *pFences, @@ -1396,7 +1396,7 @@ tu_WaitForFences(VkDevice _device, return drm_syncobj_wait(device, handles, fenceCount, absolute_timeout(timeout), waitAll); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_ResetFences(VkDevice _device, uint32_t fenceCount, const VkFence *pFences) { TU_FROM_HANDLE(tu_device, device, _device); @@ -1421,7 +1421,7 @@ tu_ResetFences(VkDevice _device, uint32_t fenceCount, const VkFence *pFences) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetFenceStatus(VkDevice _device, VkFence _fence) { TU_FROM_HANDLE(tu_device, device, _device); @@ -1596,10 +1596,10 @@ tu_wait_timelines(struct tu_device *device, } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetSemaphoreCounterValue(VkDevice _device, - VkSemaphore _semaphore, - uint64_t* pValue) + VkSemaphore _semaphore, + uint64_t* pValue) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_syncobj, semaphore, _semaphore); @@ -1619,7 +1619,7 @@ tu_GetSemaphoreCounterValue(VkDevice _device, } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_WaitSemaphores(VkDevice _device, const VkSemaphoreWaitInfoKHR* pWaitInfo, uint64_t timeout) @@ -1629,7 +1629,7 @@ tu_WaitSemaphores(VkDevice _device, return tu_wait_timelines(device, pWaitInfo, absolute_timeout(timeout)); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_SignalSemaphore(VkDevice _device, const VkSemaphoreSignalInfoKHR* pSignalInfo) { @@ -1661,7 +1661,7 @@ tu_SignalSemaphore(VkDevice _device, #ifdef ANDROID #include -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_QueueSignalReleaseImageANDROID(VkQueue _queue, uint32_t waitSemaphoreCount, const VkSemaphore *pWaitSemaphores, diff --git a/src/freedreno/vulkan/tu_formats.c b/src/freedreno/vulkan/tu_formats.c index e49113669f6..576626be599 100644 --- a/src/freedreno/vulkan/tu_formats.c +++ b/src/freedreno/vulkan/tu_formats.c @@ -473,7 +473,7 @@ end: out_properties->bufferFeatures = buffer; } -void +VKAPI_ATTR void VKAPI_CALL tu_GetPhysicalDeviceFormatProperties2( VkPhysicalDevice physicalDevice, VkFormat format, @@ -722,7 +722,7 @@ tu_get_external_image_format_properties( return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPhysicalDeviceImageFormatProperties2( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *base_info, @@ -824,7 +824,7 @@ fail: return result; } -void +VKAPI_ATTR void VKAPI_CALL tu_GetPhysicalDeviceSparseImageFormatProperties2( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSparseImageFormatInfo2 *pFormatInfo, @@ -835,7 +835,7 @@ tu_GetPhysicalDeviceSparseImageFormatProperties2( *pPropertyCount = 0; } -void +VKAPI_ATTR void VKAPI_CALL tu_GetPhysicalDeviceExternalBufferProperties( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfo *pExternalBufferInfo, diff --git a/src/freedreno/vulkan/tu_image.c b/src/freedreno/vulkan/tu_image.c index c81b028170d..89b7c9243c6 100644 --- a/src/freedreno/vulkan/tu_image.c +++ b/src/freedreno/vulkan/tu_image.c @@ -499,7 +499,7 @@ ubwc_possible(VkFormat format, VkImageType type, VkImageUsageFlags usage, return true; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateImage(VkDevice _device, const VkImageCreateInfo *pCreateInfo, const VkAllocationCallbacks *alloc, @@ -725,7 +725,7 @@ invalid_layout: return vk_error(device->instance, VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT); } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyImage(VkDevice _device, VkImage _image, const VkAllocationCallbacks *pAllocator) @@ -744,7 +744,7 @@ tu_DestroyImage(VkDevice _device, vk_object_free(&device->vk, pAllocator, image); } -void +VKAPI_ATTR void VKAPI_CALL tu_GetImageSubresourceLayout(VkDevice _device, VkImage _image, const VkImageSubresource *pSubresource, @@ -771,7 +771,8 @@ tu_GetImageSubresourceLayout(VkDevice _device, } } -VkResult tu_GetImageDrmFormatModifierPropertiesEXT( +VKAPI_ATTR VkResult VKAPI_CALL +tu_GetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage _image, VkImageDrmFormatModifierPropertiesEXT* pProperties) @@ -791,7 +792,7 @@ VkResult tu_GetImageDrmFormatModifierPropertiesEXT( } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateImageView(VkDevice _device, const VkImageViewCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -812,7 +813,7 @@ tu_CreateImageView(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyImageView(VkDevice _device, VkImageView _iview, const VkAllocationCallbacks *pAllocator) @@ -874,7 +875,7 @@ tu_buffer_view_init(struct tu_buffer_view *view, view->descriptor[5] = iova >> 32; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateBufferView(VkDevice _device, const VkBufferViewCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -895,7 +896,7 @@ tu_CreateBufferView(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyBufferView(VkDevice _device, VkBufferView bufferView, const VkAllocationCallbacks *pAllocator) diff --git a/src/freedreno/vulkan/tu_kgsl.c b/src/freedreno/vulkan/tu_kgsl.c index 2cd8ebf304c..ea65c66525f 100644 --- a/src/freedreno/vulkan/tu_kgsl.c +++ b/src/freedreno/vulkan/tu_kgsl.c @@ -331,7 +331,7 @@ sync_merge(const VkSemaphore *syncobjs, uint32_t count, bool wait_all, bool rese return ret; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_QueueSubmit(VkQueue _queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, @@ -492,7 +492,7 @@ sync_create(VkDevice _device, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_ImportSemaphoreFdKHR(VkDevice _device, const VkImportSemaphoreFdInfoKHR *pImportSemaphoreFdInfo) { @@ -500,7 +500,7 @@ tu_ImportSemaphoreFdKHR(VkDevice _device, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetSemaphoreFdKHR(VkDevice _device, const VkSemaphoreGetFdInfoKHR *pGetFdInfo, int *pFd) @@ -509,7 +509,7 @@ tu_GetSemaphoreFdKHR(VkDevice _device, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateSemaphore(VkDevice device, const VkSemaphoreCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -518,7 +518,7 @@ tu_CreateSemaphore(VkDevice device, return sync_create(device, false, false, pAllocator, (void**) pSemaphore); } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroySemaphore(VkDevice _device, VkSemaphore semaphore, const VkAllocationCallbacks *pAllocator) @@ -532,7 +532,7 @@ tu_DestroySemaphore(VkDevice _device, vk_object_free(&device->vk, pAllocator, sync); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_ImportFenceFdKHR(VkDevice _device, const VkImportFenceFdInfoKHR *pImportFenceFdInfo) { @@ -541,7 +541,7 @@ tu_ImportFenceFdKHR(VkDevice _device, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetFenceFdKHR(VkDevice _device, const VkFenceGetFdInfoKHR *pGetFdInfo, int *pFd) @@ -551,7 +551,7 @@ tu_GetFenceFdKHR(VkDevice _device, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateFence(VkDevice device, const VkFenceCreateInfo *info, const VkAllocationCallbacks *pAllocator, @@ -561,7 +561,7 @@ tu_CreateFence(VkDevice device, pAllocator, (void**) pFence); } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyFence(VkDevice _device, VkFence fence, const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); @@ -573,7 +573,7 @@ tu_DestroyFence(VkDevice _device, VkFence fence, const VkAllocationCallbacks *pA vk_object_free(&device->vk, pAllocator, sync); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_WaitForFences(VkDevice _device, uint32_t count, const VkFence *pFences, @@ -600,7 +600,7 @@ tu_WaitForFences(VkDevice _device, return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_ResetFences(VkDevice _device, uint32_t count, const VkFence *pFences) { for (uint32_t i = 0; i < count; i++) { @@ -610,7 +610,7 @@ tu_ResetFences(VkDevice _device, uint32_t count, const VkFence *pFences) return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetFenceStatus(VkDevice _device, VkFence _fence) { TU_FROM_HANDLE(tu_device, device, _device); @@ -656,7 +656,7 @@ tu_device_submit_deferred_locked(struct tu_device *dev) } #ifdef ANDROID -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_QueueSignalReleaseImageANDROID(VkQueue _queue, uint32_t waitSemaphoreCount, const VkSemaphore *pWaitSemaphores, diff --git a/src/freedreno/vulkan/tu_legacy.c b/src/freedreno/vulkan/tu_legacy.c index 8209a96b03a..9211c33d54c 100644 --- a/src/freedreno/vulkan/tu_legacy.c +++ b/src/freedreno/vulkan/tu_legacy.c @@ -13,7 +13,7 @@ #include "tu_entrypoints.h" #include "vk_util.h" -void +VKAPI_ATTR void VKAPI_CALL tu_GetPhysicalDeviceQueueFamilyProperties(VkPhysicalDevice pdev, uint32_t *count, VkQueueFamilyProperties *props) @@ -31,7 +31,7 @@ tu_GetPhysicalDeviceQueueFamilyProperties(VkPhysicalDevice pdev, props[i] = props2[i].queueFamilyProperties; } -void +VKAPI_ATTR void VKAPI_CALL tu_GetPhysicalDeviceSparseImageFormatProperties(VkPhysicalDevice pdev, VkFormat format, VkImageType type, @@ -63,7 +63,7 @@ tu_GetPhysicalDeviceSparseImageFormatProperties(VkPhysicalDevice pdev, props[i] = props2[i].properties; } -void +VKAPI_ATTR void VKAPI_CALL tu_GetImageSparseMemoryRequirements(VkDevice device, VkImage image, uint32_t *count, diff --git a/src/freedreno/vulkan/tu_pass.c b/src/freedreno/vulkan/tu_pass.c index e63ee0c33a9..22f16622710 100644 --- a/src/freedreno/vulkan/tu_pass.c +++ b/src/freedreno/vulkan/tu_pass.c @@ -486,7 +486,7 @@ is_depth_stencil_resolve_enabled(const VkSubpassDescriptionDepthStencilResolve * return false; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateRenderPass2(VkDevice _device, const VkRenderPassCreateInfo2KHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -667,7 +667,7 @@ tu_CreateRenderPass2(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyRenderPass(VkDevice _device, VkRenderPass _pass, const VkAllocationCallbacks *pAllocator) @@ -682,7 +682,7 @@ tu_DestroyRenderPass(VkDevice _device, vk_object_free(&device->vk, pAllocator, pass); } -void +VKAPI_ATTR void VKAPI_CALL tu_GetRenderAreaGranularity(VkDevice _device, VkRenderPass renderPass, VkExtent2D *pGranularity) diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c index 1017cd638ef..33758e7d3e5 100644 --- a/src/freedreno/vulkan/tu_pipeline.c +++ b/src/freedreno/vulkan/tu_pipeline.c @@ -3043,7 +3043,7 @@ tu_graphics_pipeline_create(VkDevice device, return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateGraphicsPipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t count, @@ -3157,7 +3157,7 @@ fail: return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateComputePipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t count, @@ -3178,7 +3178,7 @@ tu_CreateComputePipelines(VkDevice device, return final_result; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyPipeline(VkDevice _device, VkPipeline _pipeline, const VkAllocationCallbacks *pAllocator) @@ -3208,7 +3208,7 @@ tu_pipeline_get_executable(struct tu_pipeline *pipeline, uint32_t index) &pipeline->executables, struct tu_pipeline_executable, index); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPipelineExecutablePropertiesKHR( VkDevice _device, const VkPipelineInfoKHR* pPipelineInfo, @@ -3239,7 +3239,7 @@ tu_GetPipelineExecutablePropertiesKHR( return vk_outarray_status(&out); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPipelineExecutableStatisticsKHR( VkDevice _device, const VkPipelineExecutableInfoKHR* pExecutableInfo, @@ -3374,7 +3374,7 @@ write_ir_text(VkPipelineExecutableInternalRepresentationKHR* ir, return true; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPipelineExecutableInternalRepresentationsKHR( VkDevice _device, const VkPipelineExecutableInfoKHR* pExecutableInfo, diff --git a/src/freedreno/vulkan/tu_pipeline_cache.c b/src/freedreno/vulkan/tu_pipeline_cache.c index 10051f40454..b5b15542c1c 100644 --- a/src/freedreno/vulkan/tu_pipeline_cache.c +++ b/src/freedreno/vulkan/tu_pipeline_cache.c @@ -242,7 +242,7 @@ tu_pipeline_cache_load(struct tu_pipeline_cache *cache, } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreatePipelineCache(VkDevice _device, const VkPipelineCacheCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -276,7 +276,7 @@ tu_CreatePipelineCache(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyPipelineCache(VkDevice _device, VkPipelineCache _cache, const VkAllocationCallbacks *pAllocator) @@ -291,7 +291,7 @@ tu_DestroyPipelineCache(VkDevice _device, vk_object_free(&device->vk, pAllocator, cache); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPipelineCacheData(VkDevice _device, VkPipelineCache _cache, size_t *pDataSize, @@ -361,7 +361,7 @@ tu_pipeline_cache_merge(struct tu_pipeline_cache *dst, } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_MergePipelineCaches(VkDevice _device, VkPipelineCache destCache, uint32_t srcCacheCount, diff --git a/src/freedreno/vulkan/tu_query.c b/src/freedreno/vulkan/tu_query.c index b83b4f4bb70..b87b172f656 100644 --- a/src/freedreno/vulkan/tu_query.c +++ b/src/freedreno/vulkan/tu_query.c @@ -214,7 +214,7 @@ compare_perfcntr_pass(const void *a, const void *b) ((struct tu_perf_query_data *)b)->pass; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateQueryPool(VkDevice _device, const VkQueryPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -342,7 +342,7 @@ tu_CreateQueryPool(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroyQueryPool(VkDevice _device, VkQueryPool _pool, const VkAllocationCallbacks *pAllocator) @@ -527,7 +527,7 @@ get_query_pool_results(struct tu_device *device, return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetQueryPoolResults(VkDevice _device, VkQueryPool queryPool, uint32_t firstQuery, @@ -669,7 +669,7 @@ emit_copy_query_pool_results(struct tu_cmd_buffer *cmdbuf, } } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdCopyQueryPoolResults(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, @@ -736,7 +736,7 @@ emit_reset_query_pool(struct tu_cmd_buffer *cmdbuf, } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdResetQueryPool(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t firstQuery, @@ -758,7 +758,7 @@ tu_CmdResetQueryPool(VkCommandBuffer commandBuffer, } } -void +VKAPI_ATTR void VKAPI_CALL tu_ResetQueryPool(VkDevice device, VkQueryPool queryPool, uint32_t firstQuery, @@ -936,7 +936,7 @@ emit_begin_xfb_query(struct tu_cmd_buffer *cmdbuf, tu6_emit_event_write(cmdbuf, cs, WRITE_PRIMITIVE_COUNTS); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdBeginQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, @@ -970,7 +970,7 @@ tu_CmdBeginQuery(VkCommandBuffer commandBuffer, } } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdBeginQueryIndexedEXT(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, @@ -1280,7 +1280,7 @@ handle_multiview_queries(struct tu_cmd_buffer *cmd, } } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdEndQuery(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query) @@ -1311,7 +1311,7 @@ tu_CmdEndQuery(VkCommandBuffer commandBuffer, handle_multiview_queries(cmdbuf, pool, query); } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdEndQueryIndexedEXT(VkCommandBuffer commandBuffer, VkQueryPool queryPool, uint32_t query, @@ -1331,7 +1331,7 @@ tu_CmdEndQueryIndexedEXT(VkCommandBuffer commandBuffer, } } -void +VKAPI_ATTR void VKAPI_CALL tu_CmdWriteTimestamp(VkCommandBuffer commandBuffer, VkPipelineStageFlagBits pipelineStage, VkQueryPool queryPool, @@ -1409,7 +1409,7 @@ tu_CmdWriteTimestamp(VkCommandBuffer commandBuffer, handle_multiview_queries(cmd, pool, query); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_EnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, @@ -1460,7 +1460,7 @@ tu_EnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR( return vk_outarray_status(&out); } -void +VKAPI_ATTR void VKAPI_CALL tu_GetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR( VkPhysicalDevice physicalDevice, const VkQueryPoolPerformanceCreateInfoKHR* pPerformanceQueryCreateInfo, @@ -1490,7 +1490,7 @@ tu_GetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR( } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_AcquireProfilingLockKHR(VkDevice device, const VkAcquireProfilingLockInfoKHR* pInfo) { @@ -1498,7 +1498,7 @@ tu_AcquireProfilingLockKHR(VkDevice device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL tu_ReleaseProfilingLockKHR(VkDevice device) { /* TODO. Probably there's something to do for kgsl. */ diff --git a/src/freedreno/vulkan/tu_wsi.c b/src/freedreno/vulkan/tu_wsi.c index c1191d716f3..4101f9a0f01 100644 --- a/src/freedreno/vulkan/tu_wsi.c +++ b/src/freedreno/vulkan/tu_wsi.c @@ -29,7 +29,7 @@ #include "wsi_common.h" #include "drm-uapi/drm_fourcc.h" -static VKAPI_PTR PFN_vkVoidFunction +static VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL tu_wsi_proc_addr(VkPhysicalDevice physicalDevice, const char *pName) { TU_FROM_HANDLE(tu_physical_device, pdevice, physicalDevice); @@ -62,7 +62,7 @@ tu_wsi_finish(struct tu_physical_device *physical_device) &physical_device->instance->vk.alloc); } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroySurfaceKHR(VkInstance _instance, VkSurfaceKHR _surface, const VkAllocationCallbacks *pAllocator) @@ -73,7 +73,7 @@ tu_DestroySurfaceKHR(VkInstance _instance, vk_free2(&instance->vk.alloc, pAllocator, surface); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, VkSurfaceKHR surface, @@ -85,7 +85,7 @@ tu_GetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice physicalDevice, &device->wsi_device, queueFamilyIndex, surface, pSupported); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPhysicalDeviceSurfaceCapabilitiesKHR( VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, @@ -97,7 +97,7 @@ tu_GetPhysicalDeviceSurfaceCapabilitiesKHR( pSurfaceCapabilities); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPhysicalDeviceSurfaceCapabilities2KHR( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, @@ -109,7 +109,7 @@ tu_GetPhysicalDeviceSurfaceCapabilities2KHR( &device->wsi_device, pSurfaceInfo, pSurfaceCapabilities); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPhysicalDeviceSurfaceCapabilities2EXT( VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, @@ -121,7 +121,7 @@ tu_GetPhysicalDeviceSurfaceCapabilities2EXT( &device->wsi_device, surface, pSurfaceCapabilities); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t *pSurfaceFormatCount, @@ -133,7 +133,7 @@ tu_GetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice physicalDevice, &device->wsi_device, surface, pSurfaceFormatCount, pSurfaceFormats); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPhysicalDeviceSurfaceFormats2KHR( VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, @@ -147,7 +147,7 @@ tu_GetPhysicalDeviceSurfaceFormats2KHR( pSurfaceFormats); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t *pPresentModeCount, @@ -159,7 +159,7 @@ tu_GetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice physicalDevice, &device->wsi_device, surface, pPresentModeCount, pPresentModes); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateSwapchainKHR(VkDevice _device, const VkSwapchainCreateInfoKHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -177,7 +177,7 @@ tu_CreateSwapchainKHR(VkDevice _device, pCreateInfo, alloc, pSwapchain); } -void +VKAPI_ATTR void VKAPI_CALL tu_DestroySwapchainKHR(VkDevice _device, VkSwapchainKHR swapchain, const VkAllocationCallbacks *pAllocator) @@ -193,7 +193,7 @@ tu_DestroySwapchainKHR(VkDevice _device, wsi_common_destroy_swapchain(_device, swapchain, alloc); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetSwapchainImagesKHR(VkDevice device, VkSwapchainKHR swapchain, uint32_t *pSwapchainImageCount, @@ -203,7 +203,7 @@ tu_GetSwapchainImagesKHR(VkDevice device, pSwapchainImages); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_AcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, @@ -223,7 +223,7 @@ tu_AcquireNextImageKHR(VkDevice device, return tu_AcquireNextImage2KHR(device, &acquire_info, pImageIndex); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_AcquireNextImage2KHR(VkDevice _device, const VkAcquireNextImageInfoKHR *pAcquireInfo, uint32_t *pImageIndex) @@ -243,7 +243,7 @@ tu_AcquireNextImage2KHR(VkDevice _device, return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_QueuePresentKHR(VkQueue _queue, const VkPresentInfoKHR *pPresentInfo) { TU_FROM_HANDLE(tu_queue, queue, _queue); @@ -253,7 +253,7 @@ tu_QueuePresentKHR(VkQueue _queue, const VkPresentInfoKHR *pPresentInfo) pPresentInfo); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetDeviceGroupPresentCapabilitiesKHR( VkDevice device, VkDeviceGroupPresentCapabilitiesKHR *pCapabilities) { @@ -264,7 +264,7 @@ tu_GetDeviceGroupPresentCapabilitiesKHR( return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetDeviceGroupSurfacePresentModesKHR( VkDevice device, VkSurfaceKHR surface, @@ -275,7 +275,7 @@ tu_GetDeviceGroupSurfacePresentModesKHR( return VK_SUCCESS; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t *pRectCount, diff --git a/src/freedreno/vulkan/tu_wsi_display.c b/src/freedreno/vulkan/tu_wsi_display.c index 38a134c08e9..877a02a1593 100644 --- a/src/freedreno/vulkan/tu_wsi_display.c +++ b/src/freedreno/vulkan/tu_wsi_display.c @@ -34,7 +34,7 @@ #include "util/debug.h" #include "wsi_common_display.h" -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPhysicalDeviceDisplayPropertiesKHR(VkPhysicalDevice physical_device, uint32_t *property_count, VkDisplayPropertiesKHR *properties) @@ -48,7 +48,7 @@ tu_GetPhysicalDeviceDisplayPropertiesKHR(VkPhysicalDevice physical_device, properties); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPhysicalDeviceDisplayProperties2KHR(VkPhysicalDevice physical_device, uint32_t *property_count, VkDisplayProperties2KHR *properties) @@ -62,7 +62,7 @@ tu_GetPhysicalDeviceDisplayProperties2KHR(VkPhysicalDevice physical_device, properties); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPhysicalDeviceDisplayPlanePropertiesKHR( VkPhysicalDevice physical_device, uint32_t *property_count, @@ -77,7 +77,7 @@ tu_GetPhysicalDeviceDisplayPlanePropertiesKHR( properties); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetPhysicalDeviceDisplayPlaneProperties2KHR( VkPhysicalDevice physical_device, uint32_t *property_count, @@ -92,7 +92,7 @@ tu_GetPhysicalDeviceDisplayPlaneProperties2KHR( properties); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetDisplayPlaneSupportedDisplaysKHR(VkPhysicalDevice physical_device, uint32_t plane_index, uint32_t *display_count, @@ -109,7 +109,7 @@ tu_GetDisplayPlaneSupportedDisplaysKHR(VkPhysicalDevice physical_device, } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetDisplayModePropertiesKHR(VkPhysicalDevice physical_device, VkDisplayKHR display, uint32_t *property_count, @@ -124,7 +124,7 @@ tu_GetDisplayModePropertiesKHR(VkPhysicalDevice physical_device, properties); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetDisplayModeProperties2KHR(VkPhysicalDevice physical_device, VkDisplayKHR display, uint32_t *property_count, @@ -139,7 +139,7 @@ tu_GetDisplayModeProperties2KHR(VkPhysicalDevice physical_device, properties); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateDisplayModeKHR(VkPhysicalDevice physical_device, VkDisplayKHR display, const VkDisplayModeCreateInfoKHR *create_info, @@ -156,7 +156,7 @@ tu_CreateDisplayModeKHR(VkPhysicalDevice physical_device, mode); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetDisplayPlaneCapabilitiesKHR(VkPhysicalDevice physical_device, VkDisplayModeKHR mode_khr, uint32_t plane_index, @@ -171,7 +171,7 @@ tu_GetDisplayPlaneCapabilitiesKHR(VkPhysicalDevice physical_device, capabilities); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetDisplayPlaneCapabilities2KHR(VkPhysicalDevice physical_device, const VkDisplayPlaneInfo2KHR *pDisplayPlaneInfo, VkDisplayPlaneCapabilities2KHR *capabilities) @@ -184,7 +184,7 @@ tu_GetDisplayPlaneCapabilities2KHR(VkPhysicalDevice physical_device, capabilities); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateDisplayPlaneSurfaceKHR( VkInstance _instance, const VkDisplaySurfaceCreateInfoKHR *create_info, @@ -203,7 +203,7 @@ tu_CreateDisplayPlaneSurfaceKHR( create_info, surface); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_ReleaseDisplayEXT(VkPhysicalDevice physical_device, VkDisplayKHR display) { @@ -215,7 +215,7 @@ tu_ReleaseDisplayEXT(VkPhysicalDevice physical_device, } #ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_AcquireXlibDisplayEXT(VkPhysicalDevice physical_device, Display *dpy, VkDisplayKHR display) @@ -228,7 +228,7 @@ tu_AcquireXlibDisplayEXT(VkPhysicalDevice physical_device, display); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetRandROutputDisplayEXT(VkPhysicalDevice physical_device, Display *dpy, RROutput output, @@ -246,7 +246,7 @@ tu_GetRandROutputDisplayEXT(VkPhysicalDevice physical_device, /* VK_EXT_display_control */ -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_DisplayPowerControlEXT(VkDevice _device, VkDisplayKHR display, const VkDisplayPowerInfoEXT *display_power_info) @@ -259,7 +259,7 @@ tu_DisplayPowerControlEXT(VkDevice _device, display_power_info); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_RegisterDeviceEventEXT(VkDevice _device, const VkDeviceEventInfoEXT *device_event_info, const VkAllocationCallbacks *allocator, @@ -297,7 +297,7 @@ tu_RegisterDeviceEventEXT(VkDevice _device, return ret; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_RegisterDisplayEventEXT(VkDevice _device, VkDisplayKHR display, const VkDisplayEventInfoEXT *display_event_info, @@ -334,7 +334,7 @@ tu_RegisterDisplayEventEXT(VkDevice _device, return ret; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_GetSwapchainCounterEXT(VkDevice _device, VkSwapchainKHR swapchain, VkSurfaceCounterFlagBitsEXT flag_bits, diff --git a/src/freedreno/vulkan/tu_wsi_wayland.c b/src/freedreno/vulkan/tu_wsi_wayland.c index cfaea0622ae..f8c74c9a820 100644 --- a/src/freedreno/vulkan/tu_wsi_wayland.c +++ b/src/freedreno/vulkan/tu_wsi_wayland.c @@ -27,7 +27,7 @@ #include "wsi_common_wayland.h" -VkBool32 +VKAPI_ATTR VkBool32 VKAPI_CALL tu_GetPhysicalDeviceWaylandPresentationSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, @@ -39,7 +39,7 @@ tu_GetPhysicalDeviceWaylandPresentationSupportKHR( display); } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL tu_CreateWaylandSurfaceKHR(VkInstance _instance, const VkWaylandSurfaceCreateInfoKHR *pCreateInfo, const VkAllocationCallbacks *pAllocator, diff --git a/src/freedreno/vulkan/tu_wsi_x11.c b/src/freedreno/vulkan/tu_wsi_x11.c index e6ce75e7f85..53af31afc69 100644 --- a/src/freedreno/vulkan/tu_wsi_x11.c +++ b/src/freedreno/vulkan/tu_wsi_x11.c @@ -34,7 +34,8 @@ #include "wsi_common_x11.h" #include "tu_private.h" -VkBool32 tu_GetPhysicalDeviceXcbPresentationSupportKHR( +VKAPI_ATTR VkBool32 VKAPI_CALL +tu_GetPhysicalDeviceXcbPresentationSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, xcb_connection_t* connection, @@ -48,7 +49,8 @@ VkBool32 tu_GetPhysicalDeviceXcbPresentationSupportKHR( connection, visual_id); } -VkBool32 tu_GetPhysicalDeviceXlibPresentationSupportKHR( +VKAPI_ATTR VkBool32 VKAPI_CALL +tu_GetPhysicalDeviceXlibPresentationSupportKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, Display* dpy, @@ -62,7 +64,8 @@ VkBool32 tu_GetPhysicalDeviceXlibPresentationSupportKHR( XGetXCBConnection(dpy), visualID); } -VkResult tu_CreateXcbSurfaceKHR( +VKAPI_ATTR VkResult VKAPI_CALL +tu_CreateXcbSurfaceKHR( VkInstance _instance, const VkXcbSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, @@ -80,7 +83,8 @@ VkResult tu_CreateXcbSurfaceKHR( return wsi_create_xcb_surface(alloc, pCreateInfo, pSurface); } -VkResult tu_CreateXlibSurfaceKHR( +VKAPI_ATTR VkResult VKAPI_CALL +tu_CreateXlibSurfaceKHR( VkInstance _instance, const VkXlibSurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator,