From 41e78330e728b81c07e5aab2ae643584195c67ed Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Thu, 14 Dec 2023 12:03:26 +0100 Subject: [PATCH] radv/radix_sort: clang-format The formatting was changed and those files were missed. Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radix_sort/radv_radix_sort.c | 66 ++++++++------------- src/amd/vulkan/radix_sort/radv_radix_sort.h | 3 +- 2 files changed, 26 insertions(+), 43 deletions(-) diff --git a/src/amd/vulkan/radix_sort/radv_radix_sort.c b/src/amd/vulkan/radix_sort/radv_radix_sort.c index 061461432c8..02767481f2f 100644 --- a/src/amd/vulkan/radix_sort/radv_radix_sort.c +++ b/src/amd/vulkan/radix_sort/radv_radix_sort.c @@ -90,9 +90,8 @@ radv_create_radix_sort_u64(VkDevice device, VkAllocationCallbacks const *ac, VkP scatter_0_even_spv, scatter_0_odd_spv, scatter_1_even_spv, scatter_1_odd_spv, }; const uint32_t spv_sizes[8] = { - sizeof(init_spv), sizeof(fill_spv), sizeof(histogram_spv), - sizeof(prefix_spv), sizeof(scatter_0_even_spv), sizeof(scatter_0_odd_spv), - sizeof(scatter_1_even_spv), sizeof(scatter_1_odd_spv), + sizeof(init_spv), sizeof(fill_spv), sizeof(histogram_spv), sizeof(prefix_spv), + sizeof(scatter_0_even_spv), sizeof(scatter_0_odd_spv), sizeof(scatter_1_even_spv), sizeof(scatter_1_odd_spv), }; return radix_sort_vk_create(device, ac, pc, spv, spv_sizes, target_config); } @@ -102,13 +101,11 @@ vkCreateShaderModule(VkDevice _device, const VkShaderModuleCreateInfo *pCreateIn const VkAllocationCallbacks *pAllocator, VkShaderModule *pShaderModule) { RADV_FROM_HANDLE(radv_device, device, _device); - return device->vk.dispatch_table.CreateShaderModule(_device, pCreateInfo, pAllocator, - pShaderModule); + return device->vk.dispatch_table.CreateShaderModule(_device, pCreateInfo, pAllocator, pShaderModule); } VKAPI_ATTR void VKAPI_CALL -vkDestroyShaderModule(VkDevice _device, VkShaderModule shaderModule, - const VkAllocationCallbacks *pAllocator) +vkDestroyShaderModule(VkDevice _device, VkShaderModule shaderModule, const VkAllocationCallbacks *pAllocator) { RADV_FROM_HANDLE(radv_device, device, _device); device->vk.dispatch_table.DestroyShaderModule(_device, shaderModule, pAllocator); @@ -119,13 +116,11 @@ vkCreatePipelineLayout(VkDevice _device, const VkPipelineLayoutCreateInfo *pCrea const VkAllocationCallbacks *pAllocator, VkPipelineLayout *pPipelineLayout) { RADV_FROM_HANDLE(radv_device, device, _device); - return device->vk.dispatch_table.CreatePipelineLayout(_device, pCreateInfo, pAllocator, - pPipelineLayout); + return device->vk.dispatch_table.CreatePipelineLayout(_device, pCreateInfo, pAllocator, pPipelineLayout); } VKAPI_ATTR void VKAPI_CALL -vkDestroyPipelineLayout(VkDevice _device, VkPipelineLayout pipelineLayout, - const VkAllocationCallbacks *pAllocator) +vkDestroyPipelineLayout(VkDevice _device, VkPipelineLayout pipelineLayout, const VkAllocationCallbacks *pAllocator) { RADV_FROM_HANDLE(radv_device, device, _device); device->vk.dispatch_table.DestroyPipelineLayout(_device, pipelineLayout, pAllocator); @@ -133,63 +128,53 @@ vkDestroyPipelineLayout(VkDevice _device, VkPipelineLayout pipelineLayout, VKAPI_ATTR VkResult VKAPI_CALL vkCreateComputePipelines(VkDevice _device, VkPipelineCache pipelineCache, uint32_t createInfoCount, - const VkComputePipelineCreateInfo *pCreateInfos, - const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) + const VkComputePipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, + VkPipeline *pPipelines) { RADV_FROM_HANDLE(radv_device, device, _device); - return device->vk.dispatch_table.CreateComputePipelines(_device, pipelineCache, createInfoCount, - pCreateInfos, pAllocator, pPipelines); + return radv_CreateComputePipelines(_device, pipelineCache, createInfoCount, pCreateInfos, pAllocator, pPipelines); } VKAPI_ATTR void VKAPI_CALL vkDestroyPipeline(VkDevice _device, VkPipeline pipeline, const VkAllocationCallbacks *pAllocator) { RADV_FROM_HANDLE(radv_device, device, _device); - device->vk.dispatch_table.DestroyPipeline(_device, pipeline, pAllocator); + radv_DestroyPipeline(_device, pipeline, pAllocator); } VKAPI_ATTR void VKAPI_CALL vkCmdPipelineBarrier(VkCommandBuffer commandBuffer, VkPipelineStageFlags srcStageMask, - VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, - uint32_t memoryBarrierCount, const VkMemoryBarrier *pMemoryBarriers, - uint32_t bufferMemoryBarrierCount, - const VkBufferMemoryBarrier *pBufferMemoryBarriers, - uint32_t imageMemoryBarrierCount, + VkPipelineStageFlags dstStageMask, VkDependencyFlags dependencyFlags, uint32_t memoryBarrierCount, + const VkMemoryBarrier *pMemoryBarriers, uint32_t bufferMemoryBarrierCount, + const VkBufferMemoryBarrier *pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier *pImageMemoryBarriers) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); cmd_buffer->device->vk.dispatch_table.CmdPipelineBarrier( - commandBuffer, srcStageMask, dstStageMask, dependencyFlags, memoryBarrierCount, - pMemoryBarriers, bufferMemoryBarrierCount, pBufferMemoryBarriers, imageMemoryBarrierCount, - pImageMemoryBarriers); + commandBuffer, srcStageMask, dstStageMask, dependencyFlags, memoryBarrierCount, pMemoryBarriers, + bufferMemoryBarrierCount, pBufferMemoryBarriers, imageMemoryBarrierCount, pImageMemoryBarriers); } VKAPI_ATTR void VKAPI_CALL -vkCmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, - VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, - const void *pValues) +vkCmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, + uint32_t offset, uint32_t size, const void *pValues) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); - cmd_buffer->device->vk.dispatch_table.CmdPushConstants(commandBuffer, layout, stageFlags, offset, - size, pValues); + cmd_buffer->device->vk.dispatch_table.CmdPushConstants(commandBuffer, layout, stageFlags, offset, size, pValues); } VKAPI_ATTR void VKAPI_CALL -vkCmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, - VkPipeline pipeline) +vkCmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); - cmd_buffer->device->vk.dispatch_table.CmdBindPipeline(commandBuffer, pipelineBindPoint, - pipeline); + cmd_buffer->device->vk.dispatch_table.CmdBindPipeline(commandBuffer, pipelineBindPoint, pipeline); } VKAPI_ATTR void VKAPI_CALL -vkCmdDispatch(VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, - uint32_t groupCountZ) +vkCmdDispatch(VkCommandBuffer commandBuffer, uint32_t groupCountX, uint32_t groupCountY, uint32_t groupCountZ) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); - cmd_buffer->device->vk.dispatch_table.CmdDispatch(commandBuffer, groupCountX, groupCountY, - groupCountZ); + cmd_buffer->device->vk.dispatch_table.CmdDispatch(commandBuffer, groupCountX, groupCountY, groupCountZ); } VKAPI_ATTR VkDeviceAddress VKAPI_CALL @@ -200,12 +185,11 @@ vkGetBufferDeviceAddress(VkDevice _device, const VkBufferDeviceAddressInfo *pInf } VKAPI_ATTR void VKAPI_CALL -vkCmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, - VkDeviceSize size, uint32_t data) +vkCmdFillBuffer(VkCommandBuffer commandBuffer, VkBuffer dstBuffer, VkDeviceSize dstOffset, VkDeviceSize size, + uint32_t data) { RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); - cmd_buffer->device->vk.dispatch_table.CmdFillBuffer(commandBuffer, dstBuffer, dstOffset, size, - data); + cmd_buffer->device->vk.dispatch_table.CmdFillBuffer(commandBuffer, dstBuffer, dstOffset, size, data); } VKAPI_ATTR void VKAPI_CALL diff --git a/src/amd/vulkan/radix_sort/radv_radix_sort.h b/src/amd/vulkan/radix_sort/radv_radix_sort.h index 513049f467a..63473ba1ba4 100644 --- a/src/amd/vulkan/radix_sort/radv_radix_sort.h +++ b/src/amd/vulkan/radix_sort/radv_radix_sort.h @@ -26,7 +26,6 @@ #include "radix_sort_vk_devaddr.h" -radix_sort_vk_t *radv_create_radix_sort_u64(VkDevice device, VkAllocationCallbacks const *ac, - VkPipelineCache pc); +radix_sort_vk_t *radv_create_radix_sort_u64(VkDevice device, VkAllocationCallbacks const *ac, VkPipelineCache pc); #endif