From f68e25315f5b139fd7a6c6fb86517c003bb4e2e1 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Tue, 8 Nov 2022 20:15:10 +0800 Subject: [PATCH] radv: Fixes prototypes Cc: mesa-stable Signed-off-by: Yonggang Luo Reviewed-by: Jesse Natalie Reviewed-by: Samuel Pitoiset Part-of: (cherry picked from commit e5656f07c7a65b1d143684671cd8235af099a84c) --- .pick_status.json | 2 +- src/amd/vulkan/radv_cmd_buffer.c | 4 ++-- src/amd/vulkan/radv_device_generated_commands.c | 8 ++++---- src/amd/vulkan/radv_perfcounter.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 9697ef857b5..f23015799f8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2704,7 +2704,7 @@ "description": "radv: Fixes prototypes", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 90fa226d7df..430b8d40be6 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -8487,7 +8487,7 @@ radv_CmdDrawMeshTasksIndirectCountEXT(VkCommandBuffer commandBuffer, VkBuffer _b radv_after_draw(cmd_buffer); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdExecuteGeneratedCommandsNV(VkCommandBuffer commandBuffer, VkBool32 isPreprocessed, const VkGeneratedCommandsInfoNV *pGeneratedCommandsInfo) { @@ -10212,7 +10212,7 @@ radv_CmdWriteBufferMarker2AMD(VkCommandBuffer commandBuffer, VkPipelineStageFlag assert(cmd_buffer->cs->cdw <= cdw_max); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdBindPipelineShaderGroupNV(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline, uint32_t groupIndex) diff --git a/src/amd/vulkan/radv_device_generated_commands.c b/src/amd/vulkan/radv_device_generated_commands.c index 69b233cac23..0e2cb0ab967 100644 --- a/src/amd/vulkan/radv_device_generated_commands.c +++ b/src/amd/vulkan/radv_device_generated_commands.c @@ -972,7 +972,7 @@ cleanup: return result; } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_CreateIndirectCommandsLayoutNV(VkDevice _device, const VkIndirectCommandsLayoutCreateInfoNV *pCreateInfo, const VkAllocationCallbacks *pAllocator, @@ -1048,7 +1048,7 @@ radv_CreateIndirectCommandsLayoutNV(VkDevice _device, return VK_SUCCESS; } -void +VKAPI_ATTR void VKAPI_CALL radv_DestroyIndirectCommandsLayoutNV(VkDevice _device, VkIndirectCommandsLayoutNV indirectCommandsLayout, const VkAllocationCallbacks *pAllocator) @@ -1063,7 +1063,7 @@ radv_DestroyIndirectCommandsLayoutNV(VkDevice _device, vk_free2(&device->vk.alloc, pAllocator, layout); } -void +VKAPI_ATTR void VKAPI_CALL radv_GetGeneratedCommandsMemoryRequirementsNV( VkDevice _device, const VkGeneratedCommandsMemoryRequirementsInfoNV *pInfo, VkMemoryRequirements2 *pMemoryRequirements) @@ -1086,7 +1086,7 @@ radv_GetGeneratedCommandsMemoryRequirementsNV( align(cmd_buf_size + upload_buf_size, pMemoryRequirements->memoryRequirements.alignment); } -void +VKAPI_ATTR void VKAPI_CALL radv_CmdPreprocessGeneratedCommandsNV(VkCommandBuffer commandBuffer, const VkGeneratedCommandsInfoNV *pGeneratedCommandsInfo) { diff --git a/src/amd/vulkan/radv_perfcounter.c b/src/amd/vulkan/radv_perfcounter.c index 98c89fd649c..64f55a7a917 100644 --- a/src/amd/vulkan/radv_perfcounter.c +++ b/src/amd/vulkan/radv_perfcounter.c @@ -836,7 +836,7 @@ radv_pc_get_results(const struct radv_pc_query_pool *pc_pool, const uint64_t *da } } -VkResult +VKAPI_ATTR VkResult VKAPI_CALL radv_EnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR( VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex, uint32_t *pCounterCount, VkPerformanceCounterKHR *pCounters, VkPerformanceCounterDescriptionKHR *pCounterDescriptions) @@ -889,7 +889,7 @@ radv_EnumeratePhysicalDeviceQueueFamilyPerformanceQueryCountersKHR( return result; } -void +VKAPI_ATTR void VKAPI_CALL radv_GetPhysicalDeviceQueueFamilyPerformanceQueryPassesKHR( VkPhysicalDevice physicalDevice, const VkQueryPoolPerformanceCreateInfoKHR *pPerformanceQueryCreateInfo, uint32_t *pNumPasses)