From: Chad Versace Date: Mon, 5 Nov 2018 06:42:55 +0000 (-0700) Subject: turnip: Fix indentation in function signatures X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=daffb01704f5d570893195f9e71826c93d1e8961;p=mesa.git turnip: Fix indentation in function signatures Due to s/anv/tu/, in many function signatures the indentation of parameters was off-by-one. --- diff --git a/src/freedreno/vulkan/tu_android.c b/src/freedreno/vulkan/tu_android.c index fbc1bf84b84..a88ed1418d8 100644 --- a/src/freedreno/vulkan/tu_android.c +++ b/src/freedreno/vulkan/tu_android.c @@ -32,8 +32,8 @@ static int tu_hal_open(const struct hw_module_t *mod, - const char *id, - struct hw_device_t **dev); + const char *id, + struct hw_device_t **dev); static int tu_hal_close(struct hw_device_t *dev); @@ -70,8 +70,8 @@ unmask32(uint32_t *inout_mask, uint32_t test_mask) static int tu_hal_open(const struct hw_module_t *mod, - const char *id, - struct hw_device_t **dev) + const char *id, + struct hw_device_t **dev) { assert(mod == &HAL_MODULE_INFO_SYM.common); assert(strcmp(id, HWVULKAN_DEVICE_0) == 0); @@ -107,10 +107,10 @@ tu_hal_close(struct hw_device_t *dev) VkResult tu_image_from_gralloc(VkDevice device_h, - const VkImageCreateInfo *base_info, - const VkNativeBufferANDROID *gralloc_info, - const VkAllocationCallbacks *alloc, - VkImage *out_image_h) + const VkImageCreateInfo *base_info, + const VkNativeBufferANDROID *gralloc_info, + const VkAllocationCallbacks *alloc, + VkImage *out_image_h) { TU_FROM_HANDLE(tu_device, device, device_h); @@ -209,9 +209,9 @@ fail_size: VkResult tu_GetSwapchainGrallocUsageANDROID(VkDevice device_h, - VkFormat format, - VkImageUsageFlags imageUsage, - int *grallocUsage) + VkFormat format, + VkImageUsageFlags imageUsage, + int *grallocUsage) { TU_FROM_HANDLE(tu_device, device, device_h); struct tu_physical_device *phys_dev = device->physical_device; @@ -298,10 +298,10 @@ tu_GetSwapchainGrallocUsageANDROID(VkDevice device_h, VkResult tu_AcquireImageANDROID(VkDevice device, - VkImage image_h, - int nativeFenceFd, - VkSemaphore semaphore, - VkFence fence) + VkImage image_h, + int nativeFenceFd, + VkSemaphore semaphore, + VkFence fence) { VkResult semaphore_result = VK_SUCCESS, fence_result = VK_SUCCESS; @@ -339,10 +339,10 @@ tu_AcquireImageANDROID(VkDevice device, VkResult tu_QueueSignalReleaseImageANDROID(VkQueue _queue, - uint32_t waitSemaphoreCount, - const VkSemaphore *pWaitSemaphores, - VkImage image, - int *pNativeFenceFd) + uint32_t waitSemaphoreCount, + const VkSemaphore *pWaitSemaphores, + VkImage image, + int *pNativeFenceFd) { TU_FROM_HANDLE(tu_queue, queue, _queue); VkResult result = VK_SUCCESS; diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index 030e1112811..d3b68e5fd0a 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -69,7 +69,7 @@ const struct tu_dynamic_state default_dynamic_state = { static void tu_bind_dynamic_state(struct tu_cmd_buffer *cmd_buffer, - const struct tu_dynamic_state *src) + const struct tu_dynamic_state *src) { struct tu_dynamic_state *dest = &cmd_buffer->state.dynamic; uint32_t copy_mask = src->mask; @@ -177,9 +177,9 @@ tu_bind_dynamic_state(struct tu_cmd_buffer *cmd_buffer, static VkResult tu_create_cmd_buffer(struct tu_device *device, - struct tu_cmd_pool *pool, - VkCommandBufferLevel level, - VkCommandBuffer *pCommandBuffer) + struct tu_cmd_pool *pool, + VkCommandBufferLevel level, + VkCommandBuffer *pCommandBuffer) { struct tu_cmd_buffer *cmd_buffer; cmd_buffer = vk_zalloc( @@ -240,8 +240,8 @@ tu_reset_cmd_buffer(struct tu_cmd_buffer *cmd_buffer) VkResult tu_AllocateCommandBuffers(VkDevice _device, - const VkCommandBufferAllocateInfo *pAllocateInfo, - VkCommandBuffer *pCommandBuffers) + const VkCommandBufferAllocateInfo *pAllocateInfo, + VkCommandBuffer *pCommandBuffers) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_cmd_pool, pool, pAllocateInfo->commandPool); @@ -294,9 +294,9 @@ tu_AllocateCommandBuffers(VkDevice _device, void tu_FreeCommandBuffers(VkDevice device, - VkCommandPool commandPool, - uint32_t commandBufferCount, - const VkCommandBuffer *pCommandBuffers) + VkCommandPool commandPool, + uint32_t commandBufferCount, + const VkCommandBuffer *pCommandBuffers) { for (uint32_t i = 0; i < commandBufferCount; i++) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, pCommandBuffers[i]); @@ -314,7 +314,7 @@ tu_FreeCommandBuffers(VkDevice device, VkResult tu_ResetCommandBuffer(VkCommandBuffer commandBuffer, - VkCommandBufferResetFlags flags) + VkCommandBufferResetFlags flags) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); return tu_reset_cmd_buffer(cmd_buffer); @@ -322,7 +322,7 @@ tu_ResetCommandBuffer(VkCommandBuffer commandBuffer, VkResult tu_BeginCommandBuffer(VkCommandBuffer commandBuffer, - const VkCommandBufferBeginInfo *pBeginInfo) + const VkCommandBufferBeginInfo *pBeginInfo) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); VkResult result = VK_SUCCESS; @@ -357,40 +357,40 @@ tu_BeginCommandBuffer(VkCommandBuffer commandBuffer, void tu_CmdBindVertexBuffers(VkCommandBuffer commandBuffer, - uint32_t firstBinding, - uint32_t bindingCount, - const VkBuffer *pBuffers, - const VkDeviceSize *pOffsets) + uint32_t firstBinding, + uint32_t bindingCount, + const VkBuffer *pBuffers, + const VkDeviceSize *pOffsets) { } void tu_CmdBindIndexBuffer(VkCommandBuffer commandBuffer, - VkBuffer buffer, - VkDeviceSize offset, - VkIndexType indexType) + VkBuffer buffer, + VkDeviceSize offset, + VkIndexType indexType) { } void tu_CmdBindDescriptorSets(VkCommandBuffer commandBuffer, - VkPipelineBindPoint pipelineBindPoint, - VkPipelineLayout _layout, - uint32_t firstSet, - uint32_t descriptorSetCount, - const VkDescriptorSet *pDescriptorSets, - uint32_t dynamicOffsetCount, - const uint32_t *pDynamicOffsets) + VkPipelineBindPoint pipelineBindPoint, + VkPipelineLayout _layout, + uint32_t firstSet, + uint32_t descriptorSetCount, + const VkDescriptorSet *pDescriptorSets, + uint32_t dynamicOffsetCount, + const uint32_t *pDynamicOffsets) { } void tu_CmdPushConstants(VkCommandBuffer commandBuffer, - VkPipelineLayout layout, - VkShaderStageFlags stageFlags, - uint32_t offset, - uint32_t size, - const void *pValues) + VkPipelineLayout layout, + VkShaderStageFlags stageFlags, + uint32_t offset, + uint32_t size, + const void *pValues) { } @@ -406,24 +406,24 @@ tu_EndCommandBuffer(VkCommandBuffer commandBuffer) void tu_CmdBindPipeline(VkCommandBuffer commandBuffer, - VkPipelineBindPoint pipelineBindPoint, - VkPipeline _pipeline) + VkPipelineBindPoint pipelineBindPoint, + VkPipeline _pipeline) { } void tu_CmdSetViewport(VkCommandBuffer commandBuffer, - uint32_t firstViewport, - uint32_t viewportCount, - const VkViewport *pViewports) + uint32_t firstViewport, + uint32_t viewportCount, + const VkViewport *pViewports) { } void tu_CmdSetScissor(VkCommandBuffer commandBuffer, - uint32_t firstScissor, - uint32_t scissorCount, - const VkRect2D *pScissors) + uint32_t firstScissor, + uint32_t scissorCount, + const VkRect2D *pScissors) { } @@ -434,58 +434,58 @@ tu_CmdSetLineWidth(VkCommandBuffer commandBuffer, float lineWidth) void tu_CmdSetDepthBias(VkCommandBuffer commandBuffer, - float depthBiasConstantFactor, - float depthBiasClamp, - float depthBiasSlopeFactor) + float depthBiasConstantFactor, + float depthBiasClamp, + float depthBiasSlopeFactor) { } void tu_CmdSetBlendConstants(VkCommandBuffer commandBuffer, - const float blendConstants[4]) + const float blendConstants[4]) { } void tu_CmdSetDepthBounds(VkCommandBuffer commandBuffer, - float minDepthBounds, - float maxDepthBounds) + float minDepthBounds, + float maxDepthBounds) { } void tu_CmdSetStencilCompareMask(VkCommandBuffer commandBuffer, - VkStencilFaceFlags faceMask, - uint32_t compareMask) + VkStencilFaceFlags faceMask, + uint32_t compareMask) { } void tu_CmdSetStencilWriteMask(VkCommandBuffer commandBuffer, - VkStencilFaceFlags faceMask, - uint32_t writeMask) + VkStencilFaceFlags faceMask, + uint32_t writeMask) { } void tu_CmdSetStencilReference(VkCommandBuffer commandBuffer, - VkStencilFaceFlags faceMask, - uint32_t reference) + VkStencilFaceFlags faceMask, + uint32_t reference) { } void tu_CmdExecuteCommands(VkCommandBuffer commandBuffer, - uint32_t commandBufferCount, - const VkCommandBuffer *pCmdBuffers) + uint32_t commandBufferCount, + const VkCommandBuffer *pCmdBuffers) { } VkResult tu_CreateCommandPool(VkDevice _device, - const VkCommandPoolCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkCommandPool *pCmdPool) + const VkCommandPoolCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkCommandPool *pCmdPool) { TU_FROM_HANDLE(tu_device, device, _device); struct tu_cmd_pool *pool; @@ -515,8 +515,8 @@ tu_CreateCommandPool(VkDevice _device, void tu_DestroyCommandPool(VkDevice _device, - VkCommandPool commandPool, - const VkAllocationCallbacks *pAllocator) + VkCommandPool commandPool, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_cmd_pool, pool, commandPool); @@ -541,8 +541,8 @@ tu_DestroyCommandPool(VkDevice _device, VkResult tu_ResetCommandPool(VkDevice device, - VkCommandPool commandPool, - VkCommandPoolResetFlags flags) + VkCommandPool commandPool, + VkCommandPoolResetFlags flags) { TU_FROM_HANDLE(tu_cmd_pool, pool, commandPool); VkResult result; @@ -560,8 +560,8 @@ tu_ResetCommandPool(VkDevice device, void tu_TrimCommandPool(VkDevice device, - VkCommandPool commandPool, - VkCommandPoolTrimFlagsKHR flags) + VkCommandPool commandPool, + VkCommandPoolTrimFlagsKHR flags) { TU_FROM_HANDLE(tu_cmd_pool, pool, commandPool); @@ -577,15 +577,15 @@ tu_TrimCommandPool(VkDevice device, void tu_CmdBeginRenderPass(VkCommandBuffer commandBuffer, - const VkRenderPassBeginInfo *pRenderPassBegin, - VkSubpassContents contents) + const VkRenderPassBeginInfo *pRenderPassBegin, + VkSubpassContents contents) { } void tu_CmdBeginRenderPass2KHR(VkCommandBuffer commandBuffer, - const VkRenderPassBeginInfo *pRenderPassBeginInfo, - const VkSubpassBeginInfoKHR *pSubpassBeginInfo) + const VkRenderPassBeginInfo *pRenderPassBeginInfo, + const VkSubpassBeginInfoKHR *pSubpassBeginInfo) { tu_CmdBeginRenderPass( commandBuffer, pRenderPassBeginInfo, pSubpassBeginInfo->contents); @@ -598,8 +598,8 @@ tu_CmdNextSubpass(VkCommandBuffer commandBuffer, VkSubpassContents contents) void tu_CmdNextSubpass2KHR(VkCommandBuffer commandBuffer, - const VkSubpassBeginInfoKHR *pSubpassBeginInfo, - const VkSubpassEndInfoKHR *pSubpassEndInfo) + const VkSubpassBeginInfoKHR *pSubpassBeginInfo, + const VkSubpassEndInfoKHR *pSubpassEndInfo) { tu_CmdNextSubpass(commandBuffer, pSubpassBeginInfo->contents); } @@ -657,10 +657,10 @@ tu_draw(struct tu_cmd_buffer *cmd_buffer, const struct tu_draw_info *info) void tu_CmdDraw(VkCommandBuffer commandBuffer, - uint32_t vertexCount, - uint32_t instanceCount, - uint32_t firstVertex, - uint32_t firstInstance) + uint32_t vertexCount, + uint32_t instanceCount, + uint32_t firstVertex, + uint32_t firstInstance) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); struct tu_draw_info info = {}; @@ -675,11 +675,11 @@ tu_CmdDraw(VkCommandBuffer commandBuffer, void tu_CmdDrawIndexed(VkCommandBuffer commandBuffer, - uint32_t indexCount, - uint32_t instanceCount, - uint32_t firstIndex, - int32_t vertexOffset, - uint32_t firstInstance) + uint32_t indexCount, + uint32_t instanceCount, + uint32_t firstIndex, + int32_t vertexOffset, + uint32_t firstInstance) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); struct tu_draw_info info = {}; @@ -696,10 +696,10 @@ tu_CmdDrawIndexed(VkCommandBuffer commandBuffer, void tu_CmdDrawIndirect(VkCommandBuffer commandBuffer, - VkBuffer _buffer, - VkDeviceSize offset, - uint32_t drawCount, - uint32_t stride) + VkBuffer _buffer, + VkDeviceSize offset, + uint32_t drawCount, + uint32_t stride) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); TU_FROM_HANDLE(tu_buffer, buffer, _buffer); @@ -715,10 +715,10 @@ tu_CmdDrawIndirect(VkCommandBuffer commandBuffer, void tu_CmdDrawIndexedIndirect(VkCommandBuffer commandBuffer, - VkBuffer _buffer, - VkDeviceSize offset, - uint32_t drawCount, - uint32_t stride) + VkBuffer _buffer, + VkDeviceSize offset, + uint32_t drawCount, + uint32_t stride) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); TU_FROM_HANDLE(tu_buffer, buffer, _buffer); @@ -759,18 +759,18 @@ struct tu_dispatch_info static void tu_dispatch(struct tu_cmd_buffer *cmd_buffer, - const struct tu_dispatch_info *info) + const struct tu_dispatch_info *info) { } void tu_CmdDispatchBase(VkCommandBuffer commandBuffer, - uint32_t base_x, - uint32_t base_y, - uint32_t base_z, - uint32_t x, - uint32_t y, - uint32_t z) + uint32_t base_x, + uint32_t base_y, + uint32_t base_z, + uint32_t x, + uint32_t y, + uint32_t z) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); struct tu_dispatch_info info = {}; @@ -787,17 +787,17 @@ tu_CmdDispatchBase(VkCommandBuffer commandBuffer, void tu_CmdDispatch(VkCommandBuffer commandBuffer, - uint32_t x, - uint32_t y, - uint32_t z) + uint32_t x, + uint32_t y, + uint32_t z) { tu_CmdDispatchBase(commandBuffer, 0, 0, 0, x, y, z); } void tu_CmdDispatchIndirect(VkCommandBuffer commandBuffer, - VkBuffer _buffer, - VkDeviceSize offset) + VkBuffer _buffer, + VkDeviceSize offset) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); TU_FROM_HANDLE(tu_buffer, buffer, _buffer); @@ -816,7 +816,7 @@ tu_CmdEndRenderPass(VkCommandBuffer commandBuffer) void tu_CmdEndRenderPass2KHR(VkCommandBuffer commandBuffer, - const VkSubpassEndInfoKHR *pSubpassEndInfo) + const VkSubpassEndInfoKHR *pSubpassEndInfo) { tu_CmdEndRenderPass(commandBuffer); } @@ -830,27 +830,27 @@ struct tu_barrier_info static void tu_barrier(struct tu_cmd_buffer *cmd_buffer, - uint32_t memoryBarrierCount, - const VkMemoryBarrier *pMemoryBarriers, - uint32_t bufferMemoryBarrierCount, - const VkBufferMemoryBarrier *pBufferMemoryBarriers, - uint32_t imageMemoryBarrierCount, - const VkImageMemoryBarrier *pImageMemoryBarriers, - const struct tu_barrier_info *info) + uint32_t memoryBarrierCount, + const VkMemoryBarrier *pMemoryBarriers, + uint32_t bufferMemoryBarrierCount, + const VkBufferMemoryBarrier *pBufferMemoryBarriers, + uint32_t imageMemoryBarrierCount, + const VkImageMemoryBarrier *pImageMemoryBarriers, + const struct tu_barrier_info *info) { } void tu_CmdPipelineBarrier(VkCommandBuffer commandBuffer, - VkPipelineStageFlags srcStageMask, - VkPipelineStageFlags destStageMask, - VkBool32 byRegion, - uint32_t memoryBarrierCount, - const VkMemoryBarrier *pMemoryBarriers, - uint32_t bufferMemoryBarrierCount, - const VkBufferMemoryBarrier *pBufferMemoryBarriers, - uint32_t imageMemoryBarrierCount, - const VkImageMemoryBarrier *pImageMemoryBarriers) + VkPipelineStageFlags srcStageMask, + VkPipelineStageFlags destStageMask, + VkBool32 byRegion, + uint32_t memoryBarrierCount, + const VkMemoryBarrier *pMemoryBarriers, + uint32_t bufferMemoryBarrierCount, + const VkBufferMemoryBarrier *pBufferMemoryBarriers, + uint32_t imageMemoryBarrierCount, + const VkImageMemoryBarrier *pImageMemoryBarriers) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); struct tu_barrier_info info; @@ -879,8 +879,8 @@ write_event(struct tu_cmd_buffer *cmd_buffer, void tu_CmdSetEvent(VkCommandBuffer commandBuffer, - VkEvent _event, - VkPipelineStageFlags stageMask) + VkEvent _event, + VkPipelineStageFlags stageMask) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); TU_FROM_HANDLE(tu_event, event, _event); @@ -890,8 +890,8 @@ tu_CmdSetEvent(VkCommandBuffer commandBuffer, void tu_CmdResetEvent(VkCommandBuffer commandBuffer, - VkEvent _event, - VkPipelineStageFlags stageMask) + VkEvent _event, + VkPipelineStageFlags stageMask) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); TU_FROM_HANDLE(tu_event, event, _event); @@ -901,16 +901,16 @@ tu_CmdResetEvent(VkCommandBuffer commandBuffer, void tu_CmdWaitEvents(VkCommandBuffer commandBuffer, - uint32_t eventCount, - const VkEvent *pEvents, - VkPipelineStageFlags srcStageMask, - VkPipelineStageFlags dstStageMask, - uint32_t memoryBarrierCount, - const VkMemoryBarrier *pMemoryBarriers, - uint32_t bufferMemoryBarrierCount, - const VkBufferMemoryBarrier *pBufferMemoryBarriers, - uint32_t imageMemoryBarrierCount, - const VkImageMemoryBarrier *pImageMemoryBarriers) + uint32_t eventCount, + const VkEvent *pEvents, + VkPipelineStageFlags srcStageMask, + VkPipelineStageFlags dstStageMask, + uint32_t memoryBarrierCount, + const VkMemoryBarrier *pMemoryBarriers, + uint32_t bufferMemoryBarrierCount, + const VkBufferMemoryBarrier *pBufferMemoryBarriers, + uint32_t imageMemoryBarrierCount, + const VkImageMemoryBarrier *pImageMemoryBarriers) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); struct tu_barrier_info info; diff --git a/src/freedreno/vulkan/tu_descriptor_set.c b/src/freedreno/vulkan/tu_descriptor_set.c index a9dd6df1727..1ea7f6870c4 100644 --- a/src/freedreno/vulkan/tu_descriptor_set.c +++ b/src/freedreno/vulkan/tu_descriptor_set.c @@ -64,10 +64,10 @@ create_sorted_bindings(const VkDescriptorSetLayoutBinding *bindings, VkResult tu_CreateDescriptorSetLayout( - VkDevice _device, - const VkDescriptorSetLayoutCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkDescriptorSetLayout *pSetLayout) + VkDevice _device, + const VkDescriptorSetLayoutCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkDescriptorSetLayout *pSetLayout) { TU_FROM_HANDLE(tu_device, device, _device); struct tu_descriptor_set_layout *set_layout; @@ -211,8 +211,8 @@ tu_CreateDescriptorSetLayout( void tu_DestroyDescriptorSetLayout(VkDevice _device, - VkDescriptorSetLayout _set_layout, - const VkAllocationCallbacks *pAllocator) + VkDescriptorSetLayout _set_layout, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_descriptor_set_layout, set_layout, _set_layout); @@ -225,9 +225,9 @@ tu_DestroyDescriptorSetLayout(VkDevice _device, void tu_GetDescriptorSetLayoutSupport( - VkDevice device, - const VkDescriptorSetLayoutCreateInfo *pCreateInfo, - VkDescriptorSetLayoutSupport *pSupport) + VkDevice device, + const VkDescriptorSetLayoutCreateInfo *pCreateInfo, + VkDescriptorSetLayoutSupport *pSupport) { VkDescriptorSetLayoutBinding *bindings = create_sorted_bindings(pCreateInfo->pBindings, pCreateInfo->bindingCount); @@ -318,9 +318,9 @@ tu_GetDescriptorSetLayoutSupport( VkResult tu_CreatePipelineLayout(VkDevice _device, - const VkPipelineLayoutCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkPipelineLayout *pPipelineLayout) + const VkPipelineLayoutCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkPipelineLayout *pPipelineLayout) { TU_FROM_HANDLE(tu_device, device, _device); struct tu_pipeline_layout *layout; @@ -382,8 +382,8 @@ tu_CreatePipelineLayout(VkDevice _device, void tu_DestroyPipelineLayout(VkDevice _device, - VkPipelineLayout _pipelineLayout, - const VkAllocationCallbacks *pAllocator) + VkPipelineLayout _pipelineLayout, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_pipeline_layout, pipeline_layout, _pipelineLayout); @@ -397,9 +397,9 @@ tu_DestroyPipelineLayout(VkDevice _device, VkResult tu_CreateDescriptorPool(VkDevice _device, - const VkDescriptorPoolCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkDescriptorPool *pDescriptorPool) + const VkDescriptorPoolCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkDescriptorPool *pDescriptorPool) { TU_FROM_HANDLE(tu_device, device, _device); struct tu_descriptor_pool *pool; @@ -409,15 +409,15 @@ tu_CreateDescriptorPool(VkDevice _device, void tu_DestroyDescriptorPool(VkDevice _device, - VkDescriptorPool _pool, - const VkAllocationCallbacks *pAllocator) + VkDescriptorPool _pool, + const VkAllocationCallbacks *pAllocator) { } VkResult tu_ResetDescriptorPool(VkDevice _device, - VkDescriptorPool descriptorPool, - VkDescriptorPoolResetFlags flags) + VkDescriptorPool descriptorPool, + VkDescriptorPoolResetFlags flags) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_descriptor_pool, pool, descriptorPool); @@ -427,8 +427,8 @@ tu_ResetDescriptorPool(VkDevice _device, VkResult tu_AllocateDescriptorSets(VkDevice _device, - const VkDescriptorSetAllocateInfo *pAllocateInfo, - VkDescriptorSet *pDescriptorSets) + const VkDescriptorSetAllocateInfo *pAllocateInfo, + VkDescriptorSet *pDescriptorSets) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_descriptor_pool, pool, pAllocateInfo->descriptorPool); @@ -438,9 +438,9 @@ tu_AllocateDescriptorSets(VkDevice _device, VkResult tu_FreeDescriptorSets(VkDevice _device, - VkDescriptorPool descriptorPool, - uint32_t count, - const VkDescriptorSet *pDescriptorSets) + VkDescriptorPool descriptorPool, + uint32_t count, + const VkDescriptorSet *pDescriptorSets) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_descriptor_pool, pool, descriptorPool); @@ -450,21 +450,21 @@ tu_FreeDescriptorSets(VkDevice _device, void tu_update_descriptor_sets(struct tu_device *device, - struct tu_cmd_buffer *cmd_buffer, - VkDescriptorSet dstSetOverride, - uint32_t descriptorWriteCount, - const VkWriteDescriptorSet *pDescriptorWrites, - uint32_t descriptorCopyCount, - const VkCopyDescriptorSet *pDescriptorCopies) + struct tu_cmd_buffer *cmd_buffer, + VkDescriptorSet dstSetOverride, + uint32_t descriptorWriteCount, + const VkWriteDescriptorSet *pDescriptorWrites, + uint32_t descriptorCopyCount, + const VkCopyDescriptorSet *pDescriptorCopies) { } void tu_UpdateDescriptorSets(VkDevice _device, - uint32_t descriptorWriteCount, - const VkWriteDescriptorSet *pDescriptorWrites, - uint32_t descriptorCopyCount, - const VkCopyDescriptorSet *pDescriptorCopies) + uint32_t descriptorWriteCount, + const VkWriteDescriptorSet *pDescriptorWrites, + uint32_t descriptorCopyCount, + const VkCopyDescriptorSet *pDescriptorCopies) { TU_FROM_HANDLE(tu_device, device, _device); @@ -479,10 +479,10 @@ tu_UpdateDescriptorSets(VkDevice _device, VkResult tu_CreateDescriptorUpdateTemplate( - VkDevice _device, - const VkDescriptorUpdateTemplateCreateInfoKHR *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkDescriptorUpdateTemplateKHR *pDescriptorUpdateTemplate) + VkDevice _device, + const VkDescriptorUpdateTemplateCreateInfoKHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkDescriptorUpdateTemplateKHR *pDescriptorUpdateTemplate) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE( @@ -505,9 +505,9 @@ tu_CreateDescriptorUpdateTemplate( void tu_DestroyDescriptorUpdateTemplate( - VkDevice _device, - VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, - const VkAllocationCallbacks *pAllocator) + VkDevice _device, + VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE( @@ -521,11 +521,11 @@ tu_DestroyDescriptorUpdateTemplate( void tu_update_descriptor_set_with_template( - struct tu_device *device, - struct tu_cmd_buffer *cmd_buffer, - struct tu_descriptor_set *set, - VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, - const void *pData) + struct tu_device *device, + struct tu_cmd_buffer *cmd_buffer, + struct tu_descriptor_set *set, + VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, + const void *pData) { TU_FROM_HANDLE( tu_descriptor_update_template, templ, descriptorUpdateTemplate); @@ -533,10 +533,10 @@ tu_update_descriptor_set_with_template( void tu_UpdateDescriptorSetWithTemplate( - VkDevice _device, - VkDescriptorSet descriptorSet, - VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, - const void *pData) + VkDevice _device, + VkDescriptorSet descriptorSet, + VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, + const void *pData) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_descriptor_set, set, descriptorSet); @@ -547,10 +547,10 @@ tu_UpdateDescriptorSetWithTemplate( VkResult tu_CreateSamplerYcbcrConversion( - VkDevice device, - const VkSamplerYcbcrConversionCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkSamplerYcbcrConversion *pYcbcrConversion) + VkDevice device, + const VkSamplerYcbcrConversionCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkSamplerYcbcrConversion *pYcbcrConversion) { *pYcbcrConversion = VK_NULL_HANDLE; return VK_SUCCESS; @@ -558,8 +558,8 @@ tu_CreateSamplerYcbcrConversion( void tu_DestroySamplerYcbcrConversion(VkDevice device, - VkSamplerYcbcrConversion ycbcrConversion, - const VkAllocationCallbacks *pAllocator) + VkSamplerYcbcrConversion ycbcrConversion, + const VkAllocationCallbacks *pAllocator) { /* Do nothing. */ } diff --git a/src/freedreno/vulkan/tu_descriptor_set.h b/src/freedreno/vulkan/tu_descriptor_set.h index 087eb3ddc20..c16677a5322 100644 --- a/src/freedreno/vulkan/tu_descriptor_set.h +++ b/src/freedreno/vulkan/tu_descriptor_set.h @@ -94,7 +94,7 @@ struct tu_pipeline_layout static inline const uint32_t * tu_immutable_samplers(const struct tu_descriptor_set_layout *set, - const struct tu_descriptor_set_binding_layout *binding) + const struct tu_descriptor_set_binding_layout *binding) { return (const uint32_t *)((const char *)set + binding->immutable_samplers_offset); diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c index e6c60072333..ac6d575c726 100644 --- a/src/freedreno/vulkan/tu_device.c +++ b/src/freedreno/vulkan/tu_device.c @@ -68,8 +68,8 @@ tu_get_device_uuid(void *uuid) static VkResult tu_physical_device_init(struct tu_physical_device *device, - struct tu_instance *instance, - drmDevicePtr drm_device) + struct tu_instance *instance, + drmDevicePtr drm_device) { const char *path = drm_device->nodes[DRM_NODE_RENDER]; VkResult result; @@ -280,8 +280,8 @@ tu_get_instance_extension_index(const char *name) VkResult tu_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkInstance *pInstance) + const VkAllocationCallbacks *pAllocator, + VkInstance *pInstance) { struct tu_instance *instance; VkResult result; @@ -349,7 +349,7 @@ tu_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, void tu_DestroyInstance(VkInstance _instance, - const VkAllocationCallbacks *pAllocator) + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_instance, instance, _instance); @@ -408,8 +408,8 @@ tu_enumerate_devices(struct tu_instance *instance) VkResult tu_EnumeratePhysicalDevices(VkInstance _instance, - uint32_t *pPhysicalDeviceCount, - VkPhysicalDevice *pPhysicalDevices) + uint32_t *pPhysicalDeviceCount, + VkPhysicalDevice *pPhysicalDevices) { TU_FROM_HANDLE(tu_instance, instance, _instance); VkResult result; @@ -437,9 +437,9 @@ tu_EnumeratePhysicalDevices(VkInstance _instance, VkResult tu_EnumeratePhysicalDeviceGroups( - VkInstance _instance, - uint32_t *pPhysicalDeviceGroupCount, - VkPhysicalDeviceGroupProperties *pPhysicalDeviceGroupProperties) + VkInstance _instance, + uint32_t *pPhysicalDeviceGroupCount, + VkPhysicalDeviceGroupProperties *pPhysicalDeviceGroupProperties) { TU_FROM_HANDLE(tu_instance, instance, _instance); VkResult result; @@ -469,7 +469,7 @@ tu_EnumeratePhysicalDeviceGroups( void tu_GetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, - VkPhysicalDeviceFeatures *pFeatures) + VkPhysicalDeviceFeatures *pFeatures) { memset(pFeatures, 0, sizeof(*pFeatures)); @@ -524,7 +524,7 @@ tu_GetPhysicalDeviceFeatures(VkPhysicalDevice physicalDevice, void tu_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice, - VkPhysicalDeviceFeatures2KHR *pFeatures) + VkPhysicalDeviceFeatures2KHR *pFeatures) { vk_foreach_struct(ext, pFeatures->pNext) { @@ -611,7 +611,7 @@ tu_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice, void tu_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, - VkPhysicalDeviceProperties *pProperties) + VkPhysicalDeviceProperties *pProperties) { TU_FROM_HANDLE(tu_physical_device, pdevice, physicalDevice); VkSampleCountFlags sample_counts = 0xf; @@ -754,7 +754,7 @@ tu_GetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, void tu_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, - VkPhysicalDeviceProperties2KHR *pProperties) + VkPhysicalDeviceProperties2KHR *pProperties) { TU_FROM_HANDLE(tu_physical_device, pdevice, physicalDevice); tu_GetPhysicalDeviceProperties(physicalDevice, &pProperties->properties); @@ -808,9 +808,9 @@ tu_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, static void tu_get_physical_device_queue_family_properties( - struct tu_physical_device *pdevice, - uint32_t *pCount, - VkQueueFamilyProperties **pQueueFamilyProperties) + struct tu_physical_device *pdevice, + uint32_t *pCount, + VkQueueFamilyProperties **pQueueFamilyProperties) { int num_queue_families = 1; int idx; @@ -839,9 +839,9 @@ tu_get_physical_device_queue_family_properties( void tu_GetPhysicalDeviceQueueFamilyProperties( - VkPhysicalDevice physicalDevice, - uint32_t *pCount, - VkQueueFamilyProperties *pQueueFamilyProperties) + VkPhysicalDevice physicalDevice, + uint32_t *pCount, + VkQueueFamilyProperties *pQueueFamilyProperties) { TU_FROM_HANDLE(tu_physical_device, pdevice, physicalDevice); if (!pQueueFamilyProperties) { @@ -858,9 +858,9 @@ tu_GetPhysicalDeviceQueueFamilyProperties( void tu_GetPhysicalDeviceQueueFamilyProperties2( - VkPhysicalDevice physicalDevice, - uint32_t *pCount, - VkQueueFamilyProperties2KHR *pQueueFamilyProperties) + VkPhysicalDevice physicalDevice, + uint32_t *pCount, + VkQueueFamilyProperties2KHR *pQueueFamilyProperties) { TU_FROM_HANDLE(tu_physical_device, pdevice, physicalDevice); if (!pQueueFamilyProperties) { @@ -897,8 +897,8 @@ tu_get_system_heap_size() void tu_GetPhysicalDeviceMemoryProperties( - VkPhysicalDevice physicalDevice, - VkPhysicalDeviceMemoryProperties *pMemoryProperties) + VkPhysicalDevice physicalDevice, + VkPhysicalDeviceMemoryProperties *pMemoryProperties) { pMemoryProperties->memoryHeapCount = 1; pMemoryProperties->memoryHeaps[0].size = tu_get_system_heap_size(); @@ -913,8 +913,8 @@ tu_GetPhysicalDeviceMemoryProperties( void tu_GetPhysicalDeviceMemoryProperties2( - VkPhysicalDevice physicalDevice, - VkPhysicalDeviceMemoryProperties2KHR *pMemoryProperties) + VkPhysicalDevice physicalDevice, + VkPhysicalDeviceMemoryProperties2KHR *pMemoryProperties) { return tu_GetPhysicalDeviceMemoryProperties( physicalDevice, &pMemoryProperties->memoryProperties); @@ -922,10 +922,10 @@ tu_GetPhysicalDeviceMemoryProperties2( static int tu_queue_init(struct tu_device *device, - struct tu_queue *queue, - uint32_t queue_family_index, - int idx, - VkDeviceQueueCreateFlags flags) + struct tu_queue *queue, + uint32_t queue_family_index, + int idx, + VkDeviceQueueCreateFlags flags) { queue->_loader_data.loaderMagic = ICD_LOADER_MAGIC; queue->device = device; @@ -953,9 +953,9 @@ tu_get_device_extension_index(const char *name) VkResult tu_CreateDevice(VkPhysicalDevice physicalDevice, - const VkDeviceCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkDevice *pDevice) + const VkDeviceCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkDevice *pDevice) { TU_FROM_HANDLE(tu_physical_device, physical_device, physicalDevice); VkResult result; @@ -1086,7 +1086,7 @@ tu_DestroyDevice(VkDevice _device, const VkAllocationCallbacks *pAllocator) VkResult tu_EnumerateInstanceLayerProperties(uint32_t *pPropertyCount, - VkLayerProperties *pProperties) + VkLayerProperties *pProperties) { if (pProperties == NULL) { *pPropertyCount = 0; @@ -1099,8 +1099,8 @@ tu_EnumerateInstanceLayerProperties(uint32_t *pPropertyCount, VkResult tu_EnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, - uint32_t *pPropertyCount, - VkLayerProperties *pProperties) + uint32_t *pPropertyCount, + VkLayerProperties *pProperties) { if (pProperties == NULL) { *pPropertyCount = 0; @@ -1113,8 +1113,8 @@ tu_EnumerateDeviceLayerProperties(VkPhysicalDevice physicalDevice, void tu_GetDeviceQueue2(VkDevice _device, - const VkDeviceQueueInfo2 *pQueueInfo, - VkQueue *pQueue) + const VkDeviceQueueInfo2 *pQueueInfo, + VkQueue *pQueue) { TU_FROM_HANDLE(tu_device, device, _device); struct tu_queue *queue; @@ -1139,9 +1139,9 @@ tu_GetDeviceQueue2(VkDevice _device, void tu_GetDeviceQueue(VkDevice _device, - uint32_t queueFamilyIndex, - uint32_t queueIndex, - VkQueue *pQueue) + uint32_t queueFamilyIndex, + uint32_t queueIndex, + VkQueue *pQueue) { const VkDeviceQueueInfo2 info = (VkDeviceQueueInfo2){.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_INFO_2, @@ -1153,9 +1153,9 @@ tu_GetDeviceQueue(VkDevice _device, VkResult tu_QueueSubmit(VkQueue _queue, - uint32_t submitCount, - const VkSubmitInfo *pSubmits, - VkFence _fence) + uint32_t submitCount, + const VkSubmitInfo *pSubmits, + VkFence _fence) { return VK_SUCCESS; } @@ -1181,8 +1181,8 @@ tu_DeviceWaitIdle(VkDevice _device) VkResult tu_EnumerateInstanceExtensionProperties(const char *pLayerName, - uint32_t *pPropertyCount, - VkExtensionProperties *pProperties) + uint32_t *pPropertyCount, + VkExtensionProperties *pProperties) { VK_OUTARRAY_MAKE(out, pProperties, pPropertyCount); @@ -1197,9 +1197,9 @@ tu_EnumerateInstanceExtensionProperties(const char *pLayerName, VkResult tu_EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, - const char *pLayerName, - uint32_t *pPropertyCount, - VkExtensionProperties *pProperties) + const char *pLayerName, + uint32_t *pPropertyCount, + VkExtensionProperties *pProperties) { TU_FROM_HANDLE(tu_physical_device, device, physicalDevice); VK_OUTARRAY_MAKE(out, pProperties, pPropertyCount); @@ -1252,9 +1252,9 @@ tu_GetDeviceProcAddr(VkDevice _device, const char *pName) static VkResult tu_alloc_memory(struct tu_device *device, - const VkMemoryAllocateInfo *pAllocateInfo, - const VkAllocationCallbacks *pAllocator, - VkDeviceMemory *pMem) + const VkMemoryAllocateInfo *pAllocateInfo, + const VkAllocationCallbacks *pAllocator, + VkDeviceMemory *pMem) { struct tu_device_memory *mem; @@ -1294,9 +1294,9 @@ tu_alloc_memory(struct tu_device *device, VkResult tu_AllocateMemory(VkDevice _device, - const VkMemoryAllocateInfo *pAllocateInfo, - const VkAllocationCallbacks *pAllocator, - VkDeviceMemory *pMem) + const VkMemoryAllocateInfo *pAllocateInfo, + const VkAllocationCallbacks *pAllocator, + VkDeviceMemory *pMem) { TU_FROM_HANDLE(tu_device, device, _device); return tu_alloc_memory(device, pAllocateInfo, pAllocator, pMem); @@ -1304,8 +1304,8 @@ tu_AllocateMemory(VkDevice _device, void tu_FreeMemory(VkDevice _device, - VkDeviceMemory _mem, - const VkAllocationCallbacks *pAllocator) + VkDeviceMemory _mem, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_device_memory, mem, _mem); @@ -1321,11 +1321,11 @@ tu_FreeMemory(VkDevice _device, VkResult tu_MapMemory(VkDevice _device, - VkDeviceMemory _memory, - VkDeviceSize offset, - VkDeviceSize size, - VkMemoryMapFlags flags, - void **ppData) + VkDeviceMemory _memory, + VkDeviceSize offset, + VkDeviceSize size, + VkMemoryMapFlags flags, + void **ppData) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_device_memory, mem, _memory); @@ -1358,24 +1358,24 @@ tu_UnmapMemory(VkDevice _device, VkDeviceMemory _memory) VkResult tu_FlushMappedMemoryRanges(VkDevice _device, - uint32_t memoryRangeCount, - const VkMappedMemoryRange *pMemoryRanges) + uint32_t memoryRangeCount, + const VkMappedMemoryRange *pMemoryRanges) { return VK_SUCCESS; } VkResult tu_InvalidateMappedMemoryRanges(VkDevice _device, - uint32_t memoryRangeCount, - const VkMappedMemoryRange *pMemoryRanges) + uint32_t memoryRangeCount, + const VkMappedMemoryRange *pMemoryRanges) { return VK_SUCCESS; } void tu_GetBufferMemoryRequirements(VkDevice _device, - VkBuffer _buffer, - VkMemoryRequirements *pMemoryRequirements) + VkBuffer _buffer, + VkMemoryRequirements *pMemoryRequirements) { TU_FROM_HANDLE(tu_buffer, buffer, _buffer); @@ -1387,9 +1387,9 @@ tu_GetBufferMemoryRequirements(VkDevice _device, void tu_GetBufferMemoryRequirements2( - VkDevice device, - const VkBufferMemoryRequirementsInfo2KHR *pInfo, - VkMemoryRequirements2KHR *pMemoryRequirements) + VkDevice device, + const VkBufferMemoryRequirementsInfo2KHR *pInfo, + VkMemoryRequirements2KHR *pMemoryRequirements) { tu_GetBufferMemoryRequirements( device, pInfo->buffer, &pMemoryRequirements->memoryRequirements); @@ -1397,8 +1397,8 @@ tu_GetBufferMemoryRequirements2( void tu_GetImageMemoryRequirements(VkDevice _device, - VkImage _image, - VkMemoryRequirements *pMemoryRequirements) + VkImage _image, + VkMemoryRequirements *pMemoryRequirements) { TU_FROM_HANDLE(tu_image, image, _image); @@ -1409,8 +1409,8 @@ tu_GetImageMemoryRequirements(VkDevice _device, void tu_GetImageMemoryRequirements2(VkDevice device, - const VkImageMemoryRequirementsInfo2KHR *pInfo, - VkMemoryRequirements2KHR *pMemoryRequirements) + const VkImageMemoryRequirementsInfo2KHR *pInfo, + VkMemoryRequirements2KHR *pMemoryRequirements) { tu_GetImageMemoryRequirements( device, pInfo->image, &pMemoryRequirements->memoryRequirements); @@ -1418,45 +1418,45 @@ tu_GetImageMemoryRequirements2(VkDevice device, void tu_GetImageSparseMemoryRequirements( - VkDevice device, - VkImage image, - uint32_t *pSparseMemoryRequirementCount, - VkSparseImageMemoryRequirements *pSparseMemoryRequirements) + VkDevice device, + VkImage image, + uint32_t *pSparseMemoryRequirementCount, + VkSparseImageMemoryRequirements *pSparseMemoryRequirements) { stub(); } void tu_GetImageSparseMemoryRequirements2( - VkDevice device, - const VkImageSparseMemoryRequirementsInfo2KHR *pInfo, - uint32_t *pSparseMemoryRequirementCount, - VkSparseImageMemoryRequirements2KHR *pSparseMemoryRequirements) + VkDevice device, + const VkImageSparseMemoryRequirementsInfo2KHR *pInfo, + uint32_t *pSparseMemoryRequirementCount, + VkSparseImageMemoryRequirements2KHR *pSparseMemoryRequirements) { stub(); } void tu_GetDeviceMemoryCommitment(VkDevice device, - VkDeviceMemory memory, - VkDeviceSize *pCommittedMemoryInBytes) + VkDeviceMemory memory, + VkDeviceSize *pCommittedMemoryInBytes) { *pCommittedMemoryInBytes = 0; } VkResult tu_BindBufferMemory2(VkDevice device, - uint32_t bindInfoCount, - const VkBindBufferMemoryInfoKHR *pBindInfos) + uint32_t bindInfoCount, + const VkBindBufferMemoryInfoKHR *pBindInfos) { return VK_SUCCESS; } VkResult tu_BindBufferMemory(VkDevice device, - VkBuffer buffer, - VkDeviceMemory memory, - VkDeviceSize memoryOffset) + VkBuffer buffer, + VkDeviceMemory memory, + VkDeviceSize memoryOffset) { const VkBindBufferMemoryInfoKHR info = { .sType = VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR, @@ -1470,17 +1470,17 @@ tu_BindBufferMemory(VkDevice device, VkResult tu_BindImageMemory2(VkDevice device, - uint32_t bindInfoCount, - const VkBindImageMemoryInfoKHR *pBindInfos) + uint32_t bindInfoCount, + const VkBindImageMemoryInfoKHR *pBindInfos) { return VK_SUCCESS; } VkResult tu_BindImageMemory(VkDevice device, - VkImage image, - VkDeviceMemory memory, - VkDeviceSize memoryOffset) + VkImage image, + VkDeviceMemory memory, + VkDeviceSize memoryOffset) { const VkBindImageMemoryInfoKHR info = { .sType = VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR, @@ -1494,18 +1494,18 @@ tu_BindImageMemory(VkDevice device, VkResult tu_QueueBindSparse(VkQueue _queue, - uint32_t bindInfoCount, - const VkBindSparseInfo *pBindInfo, - VkFence _fence) + uint32_t bindInfoCount, + const VkBindSparseInfo *pBindInfo, + VkFence _fence) { return VK_SUCCESS; } VkResult tu_CreateFence(VkDevice _device, - const VkFenceCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkFence *pFence) + const VkFenceCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkFence *pFence) { TU_FROM_HANDLE(tu_device, device, _device); @@ -1525,8 +1525,8 @@ tu_CreateFence(VkDevice _device, void tu_DestroyFence(VkDevice _device, - VkFence _fence, - const VkAllocationCallbacks *pAllocator) + VkFence _fence, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_fence, fence, _fence); @@ -1539,10 +1539,10 @@ tu_DestroyFence(VkDevice _device, VkResult tu_WaitForFences(VkDevice _device, - uint32_t fenceCount, - const VkFence *pFences, - VkBool32 waitAll, - uint64_t timeout) + uint32_t fenceCount, + const VkFence *pFences, + VkBool32 waitAll, + uint64_t timeout) { return VK_SUCCESS; } @@ -1563,9 +1563,9 @@ tu_GetFenceStatus(VkDevice _device, VkFence _fence) VkResult tu_CreateSemaphore(VkDevice _device, - const VkSemaphoreCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkSemaphore *pSemaphore) + const VkSemaphoreCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkSemaphore *pSemaphore) { TU_FROM_HANDLE(tu_device, device, _device); @@ -1583,8 +1583,8 @@ tu_CreateSemaphore(VkDevice _device, void tu_DestroySemaphore(VkDevice _device, - VkSemaphore _semaphore, - const VkAllocationCallbacks *pAllocator) + VkSemaphore _semaphore, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_semaphore, sem, _semaphore); @@ -1596,9 +1596,9 @@ tu_DestroySemaphore(VkDevice _device, VkResult tu_CreateEvent(VkDevice _device, - const VkEventCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkEvent *pEvent) + const VkEventCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkEvent *pEvent) { TU_FROM_HANDLE(tu_device, device, _device); struct tu_event *event = vk_alloc2(&device->alloc, @@ -1617,8 +1617,8 @@ tu_CreateEvent(VkDevice _device, void tu_DestroyEvent(VkDevice _device, - VkEvent _event, - const VkAllocationCallbacks *pAllocator) + VkEvent _event, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_event, event, _event); @@ -1658,9 +1658,9 @@ tu_ResetEvent(VkDevice _device, VkEvent _event) VkResult tu_CreateBuffer(VkDevice _device, - const VkBufferCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkBuffer *pBuffer) + const VkBufferCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkBuffer *pBuffer) { TU_FROM_HANDLE(tu_device, device, _device); struct tu_buffer *buffer; @@ -1686,8 +1686,8 @@ tu_CreateBuffer(VkDevice _device, void tu_DestroyBuffer(VkDevice _device, - VkBuffer _buffer, - const VkAllocationCallbacks *pAllocator) + VkBuffer _buffer, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_buffer, buffer, _buffer); @@ -1708,9 +1708,9 @@ tu_surface_max_layer_count(struct tu_image_view *iview) VkResult tu_CreateFramebuffer(VkDevice _device, - const VkFramebufferCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkFramebuffer *pFramebuffer) + const VkFramebufferCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkFramebuffer *pFramebuffer) { TU_FROM_HANDLE(tu_device, device, _device); struct tu_framebuffer *framebuffer; @@ -1746,8 +1746,8 @@ tu_CreateFramebuffer(VkDevice _device, void tu_DestroyFramebuffer(VkDevice _device, - VkFramebuffer _fb, - const VkAllocationCallbacks *pAllocator) + VkFramebuffer _fb, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_framebuffer, fb, _fb); @@ -1759,16 +1759,16 @@ tu_DestroyFramebuffer(VkDevice _device, static void tu_init_sampler(struct tu_device *device, - struct tu_sampler *sampler, - const VkSamplerCreateInfo *pCreateInfo) + struct tu_sampler *sampler, + const VkSamplerCreateInfo *pCreateInfo) { } VkResult tu_CreateSampler(VkDevice _device, - const VkSamplerCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkSampler *pSampler) + const VkSamplerCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkSampler *pSampler) { TU_FROM_HANDLE(tu_device, device, _device); struct tu_sampler *sampler; @@ -1791,8 +1791,8 @@ tu_CreateSampler(VkDevice _device, void tu_DestroySampler(VkDevice _device, - VkSampler _sampler, - const VkAllocationCallbacks *pAllocator) + VkSampler _sampler, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_sampler, sampler, _sampler); @@ -1848,9 +1848,9 @@ vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *pSupportedVersion) void tu_GetPhysicalDeviceExternalSemaphoreProperties( - VkPhysicalDevice physicalDevice, - const VkPhysicalDeviceExternalSemaphoreInfoKHR *pExternalSemaphoreInfo, - VkExternalSemaphorePropertiesKHR *pExternalSemaphoreProperties) + VkPhysicalDevice physicalDevice, + const VkPhysicalDeviceExternalSemaphoreInfoKHR *pExternalSemaphoreInfo, + VkExternalSemaphorePropertiesKHR *pExternalSemaphoreProperties) { pExternalSemaphoreProperties->exportFromImportedHandleTypes = 0; pExternalSemaphoreProperties->compatibleHandleTypes = 0; @@ -1859,9 +1859,9 @@ tu_GetPhysicalDeviceExternalSemaphoreProperties( void tu_GetPhysicalDeviceExternalFenceProperties( - VkPhysicalDevice physicalDevice, - const VkPhysicalDeviceExternalFenceInfoKHR *pExternalFenceInfo, - VkExternalFencePropertiesKHR *pExternalFenceProperties) + VkPhysicalDevice physicalDevice, + const VkPhysicalDeviceExternalFenceInfoKHR *pExternalFenceInfo, + VkExternalFencePropertiesKHR *pExternalFenceProperties) { pExternalFenceProperties->exportFromImportedHandleTypes = 0; pExternalFenceProperties->compatibleHandleTypes = 0; @@ -1870,10 +1870,10 @@ tu_GetPhysicalDeviceExternalFenceProperties( VkResult tu_CreateDebugReportCallbackEXT( - VkInstance _instance, - const VkDebugReportCallbackCreateInfoEXT *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkDebugReportCallbackEXT *pCallback) + VkInstance _instance, + const VkDebugReportCallbackCreateInfoEXT *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkDebugReportCallbackEXT *pCallback) { TU_FROM_HANDLE(tu_instance, instance, _instance); return vk_create_debug_report_callback(&instance->debug_report_callbacks, @@ -1885,8 +1885,8 @@ tu_CreateDebugReportCallbackEXT( void tu_DestroyDebugReportCallbackEXT(VkInstance _instance, - VkDebugReportCallbackEXT _callback, - const VkAllocationCallbacks *pAllocator) + VkDebugReportCallbackEXT _callback, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_instance, instance, _instance); vk_destroy_debug_report_callback(&instance->debug_report_callbacks, @@ -1897,13 +1897,13 @@ tu_DestroyDebugReportCallbackEXT(VkInstance _instance, void tu_DebugReportMessageEXT(VkInstance _instance, - VkDebugReportFlagsEXT flags, - VkDebugReportObjectTypeEXT objectType, - uint64_t object, - size_t location, - int32_t messageCode, - const char *pLayerPrefix, - const char *pMessage) + VkDebugReportFlagsEXT flags, + VkDebugReportObjectTypeEXT objectType, + uint64_t object, + size_t location, + int32_t messageCode, + const char *pLayerPrefix, + const char *pMessage) { TU_FROM_HANDLE(tu_instance, instance, _instance); vk_debug_report(&instance->debug_report_callbacks, @@ -1918,11 +1918,11 @@ tu_DebugReportMessageEXT(VkInstance _instance, void tu_GetDeviceGroupPeerMemoryFeatures( - VkDevice device, - uint32_t heapIndex, - uint32_t localDeviceIndex, - uint32_t remoteDeviceIndex, - VkPeerMemoryFeatureFlags *pPeerMemoryFeatures) + VkDevice device, + uint32_t heapIndex, + uint32_t localDeviceIndex, + uint32_t remoteDeviceIndex, + VkPeerMemoryFeatureFlags *pPeerMemoryFeatures) { assert(localDeviceIndex == remoteDeviceIndex); diff --git a/src/freedreno/vulkan/tu_entrypoints_gen.py b/src/freedreno/vulkan/tu_entrypoints_gen.py index 865ad1de843..b56b32d9d3b 100644 --- a/src/freedreno/vulkan/tu_entrypoints_gen.py +++ b/src/freedreno/vulkan/tu_entrypoints_gen.py @@ -196,8 +196,8 @@ tu_resolve_entrypoint(uint32_t index) */ static bool tu_entrypoint_is_enabled(int index, uint32_t core_version, - const struct tu_instance_extension_table *instance, - const struct tu_device_extension_table *device) + const struct tu_instance_extension_table *instance, + const struct tu_device_extension_table *device) { switch (index) { % for e in entrypoints: @@ -266,9 +266,9 @@ tu_lookup_entrypoint_unchecked(const char *name) void * tu_lookup_entrypoint_checked(const char *name, - uint32_t core_version, - const struct tu_instance_extension_table *instance, - const struct tu_device_extension_table *device) + uint32_t core_version, + const struct tu_instance_extension_table *instance, + const struct tu_device_extension_table *device) { int index = tu_lookup_entrypoint(name); if (index < 0 || !tu_entrypoint_is_enabled(index, core_version, instance, device)) diff --git a/src/freedreno/vulkan/tu_formats.c b/src/freedreno/vulkan/tu_formats.c index 09f8c93a187..3571565cb50 100644 --- a/src/freedreno/vulkan/tu_formats.c +++ b/src/freedreno/vulkan/tu_formats.c @@ -35,9 +35,9 @@ static void tu_physical_device_get_format_properties( - struct tu_physical_device *physical_device, - VkFormat format, - VkFormatProperties *out_properties) + struct tu_physical_device *physical_device, + VkFormat format, + VkFormatProperties *out_properties) { VkFormatFeatureFlags linear = 0, tiled = 0, buffer = 0; const struct vk_format_description *desc = vk_format_description(format); @@ -55,8 +55,8 @@ tu_physical_device_get_format_properties( void tu_GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice, - VkFormat format, - VkFormatProperties *pFormatProperties) + VkFormat format, + VkFormatProperties *pFormatProperties) { TU_FROM_HANDLE(tu_physical_device, physical_device, physicalDevice); @@ -66,9 +66,9 @@ tu_GetPhysicalDeviceFormatProperties(VkPhysicalDevice physicalDevice, void tu_GetPhysicalDeviceFormatProperties2( - VkPhysicalDevice physicalDevice, - VkFormat format, - VkFormatProperties2KHR *pFormatProperties) + VkPhysicalDevice physicalDevice, + VkFormat format, + VkFormatProperties2KHR *pFormatProperties) { TU_FROM_HANDLE(tu_physical_device, physical_device, physicalDevice); @@ -78,8 +78,8 @@ tu_GetPhysicalDeviceFormatProperties2( static VkResult tu_get_image_format_properties(struct tu_physical_device *physical_device, - const VkPhysicalDeviceImageFormatInfo2KHR *info, - VkImageFormatProperties *pImageFormatProperties) + const VkPhysicalDeviceImageFormatInfo2KHR *info, + VkImageFormatProperties *pImageFormatProperties) { VkFormatProperties format_props; @@ -195,13 +195,13 @@ unsupported: VkResult tu_GetPhysicalDeviceImageFormatProperties( - VkPhysicalDevice physicalDevice, - VkFormat format, - VkImageType type, - VkImageTiling tiling, - VkImageUsageFlags usage, - VkImageCreateFlags createFlags, - VkImageFormatProperties *pImageFormatProperties) + VkPhysicalDevice physicalDevice, + VkFormat format, + VkImageType type, + VkImageTiling tiling, + VkImageUsageFlags usage, + VkImageCreateFlags createFlags, + VkImageFormatProperties *pImageFormatProperties) { TU_FROM_HANDLE(tu_physical_device, physical_device, physicalDevice); @@ -261,9 +261,9 @@ get_external_image_format_properties( VkResult tu_GetPhysicalDeviceImageFormatProperties2( - VkPhysicalDevice physicalDevice, - const VkPhysicalDeviceImageFormatInfo2KHR *base_info, - VkImageFormatProperties2KHR *base_props) + VkPhysicalDevice physicalDevice, + const VkPhysicalDeviceImageFormatInfo2KHR *base_info, + VkImageFormatProperties2KHR *base_props) { TU_FROM_HANDLE(tu_physical_device, physical_device, physicalDevice); const VkPhysicalDeviceExternalImageFormatInfoKHR *external_info = NULL; @@ -352,14 +352,14 @@ fail: void tu_GetPhysicalDeviceSparseImageFormatProperties( - VkPhysicalDevice physicalDevice, - VkFormat format, - VkImageType type, - uint32_t samples, - VkImageUsageFlags usage, - VkImageTiling tiling, - uint32_t *pNumProperties, - VkSparseImageFormatProperties *pProperties) + VkPhysicalDevice physicalDevice, + VkFormat format, + VkImageType type, + uint32_t samples, + VkImageUsageFlags usage, + VkImageTiling tiling, + uint32_t *pNumProperties, + VkSparseImageFormatProperties *pProperties) { /* Sparse images are not yet supported. */ *pNumProperties = 0; @@ -367,10 +367,10 @@ tu_GetPhysicalDeviceSparseImageFormatProperties( void tu_GetPhysicalDeviceSparseImageFormatProperties2( - VkPhysicalDevice physicalDevice, - const VkPhysicalDeviceSparseImageFormatInfo2KHR *pFormatInfo, - uint32_t *pPropertyCount, - VkSparseImageFormatProperties2KHR *pProperties) + VkPhysicalDevice physicalDevice, + const VkPhysicalDeviceSparseImageFormatInfo2KHR *pFormatInfo, + uint32_t *pPropertyCount, + VkSparseImageFormatProperties2KHR *pProperties) { /* Sparse images are not yet supported. */ *pPropertyCount = 0; @@ -378,9 +378,9 @@ tu_GetPhysicalDeviceSparseImageFormatProperties2( void tu_GetPhysicalDeviceExternalBufferProperties( - VkPhysicalDevice physicalDevice, - const VkPhysicalDeviceExternalBufferInfoKHR *pExternalBufferInfo, - VkExternalBufferPropertiesKHR *pExternalBufferProperties) + VkPhysicalDevice physicalDevice, + const VkPhysicalDeviceExternalBufferInfoKHR *pExternalBufferInfo, + VkExternalBufferPropertiesKHR *pExternalBufferProperties) { VkExternalMemoryFeatureFlagBitsKHR flags = 0; VkExternalMemoryHandleTypeFlagsKHR export_flags = 0; diff --git a/src/freedreno/vulkan/tu_image.c b/src/freedreno/vulkan/tu_image.c index 491bf30f2ad..26e3d94e7c4 100644 --- a/src/freedreno/vulkan/tu_image.c +++ b/src/freedreno/vulkan/tu_image.c @@ -33,9 +33,9 @@ VkResult tu_image_create(VkDevice _device, - const struct tu_image_create_info *create_info, - const VkAllocationCallbacks *alloc, - VkImage *pImage) + const struct tu_image_create_info *create_info, + const VkAllocationCallbacks *alloc, + VkImage *pImage) { TU_FROM_HANDLE(tu_device, device, _device); const VkImageCreateInfo *pCreateInfo = create_info->vk_info; @@ -86,15 +86,15 @@ tu_image_create(VkDevice _device, void tu_image_view_init(struct tu_image_view *iview, - struct tu_device *device, - const VkImageViewCreateInfo *pCreateInfo) + struct tu_device *device, + const VkImageViewCreateInfo *pCreateInfo) { } unsigned tu_image_queue_family_mask(const struct tu_image *image, - uint32_t family, - uint32_t queue_family) + uint32_t family, + uint32_t queue_family) { if (!image->exclusive) return image->queue_family_mask; @@ -107,9 +107,9 @@ tu_image_queue_family_mask(const struct tu_image *image, VkResult tu_CreateImage(VkDevice device, - const VkImageCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkImage *pImage) + const VkImageCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkImage *pImage) { #ifdef ANDROID const VkNativeBufferANDROID *gralloc_info = @@ -131,8 +131,8 @@ tu_CreateImage(VkDevice device, void tu_DestroyImage(VkDevice _device, - VkImage _image, - const VkAllocationCallbacks *pAllocator) + VkImage _image, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_image, image, _image); @@ -148,17 +148,17 @@ tu_DestroyImage(VkDevice _device, void tu_GetImageSubresourceLayout(VkDevice _device, - VkImage _image, - const VkImageSubresource *pSubresource, - VkSubresourceLayout *pLayout) + VkImage _image, + const VkImageSubresource *pSubresource, + VkSubresourceLayout *pLayout) { } VkResult tu_CreateImageView(VkDevice _device, - const VkImageViewCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkImageView *pView) + const VkImageViewCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkImageView *pView) { TU_FROM_HANDLE(tu_device, device, _device); struct tu_image_view *view; @@ -180,8 +180,8 @@ tu_CreateImageView(VkDevice _device, void tu_DestroyImageView(VkDevice _device, - VkImageView _iview, - const VkAllocationCallbacks *pAllocator) + VkImageView _iview, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_image_view, iview, _iview); @@ -193,8 +193,8 @@ tu_DestroyImageView(VkDevice _device, void tu_buffer_view_init(struct tu_buffer_view *view, - struct tu_device *device, - const VkBufferViewCreateInfo *pCreateInfo) + struct tu_device *device, + const VkBufferViewCreateInfo *pCreateInfo) { TU_FROM_HANDLE(tu_buffer, buffer, pCreateInfo->buffer); @@ -206,9 +206,9 @@ tu_buffer_view_init(struct tu_buffer_view *view, VkResult tu_CreateBufferView(VkDevice _device, - const VkBufferViewCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkBufferView *pView) + const VkBufferViewCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkBufferView *pView) { TU_FROM_HANDLE(tu_device, device, _device); struct tu_buffer_view *view; @@ -230,8 +230,8 @@ tu_CreateBufferView(VkDevice _device, void tu_DestroyBufferView(VkDevice _device, - VkBufferView bufferView, - const VkAllocationCallbacks *pAllocator) + VkBufferView bufferView, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_buffer_view, view, bufferView); diff --git a/src/freedreno/vulkan/tu_meta_blit.c b/src/freedreno/vulkan/tu_meta_blit.c index ea4e48e1cac..ebe17ec21b0 100644 --- a/src/freedreno/vulkan/tu_meta_blit.c +++ b/src/freedreno/vulkan/tu_meta_blit.c @@ -26,13 +26,13 @@ void tu_CmdBlitImage(VkCommandBuffer commandBuffer, - VkImage srcImage, - VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, - uint32_t regionCount, - const VkImageBlit *pRegions, - VkFilter filter) + VkImage srcImage, + VkImageLayout srcImageLayout, + VkImage destImage, + VkImageLayout destImageLayout, + uint32_t regionCount, + const VkImageBlit *pRegions, + VkFilter filter) { } diff --git a/src/freedreno/vulkan/tu_meta_buffer.c b/src/freedreno/vulkan/tu_meta_buffer.c index fd5bb6e5af1..0b65a600fd5 100644 --- a/src/freedreno/vulkan/tu_meta_buffer.c +++ b/src/freedreno/vulkan/tu_meta_buffer.c @@ -2,27 +2,27 @@ void tu_CmdFillBuffer(VkCommandBuffer commandBuffer, - VkBuffer dstBuffer, - VkDeviceSize dstOffset, - VkDeviceSize fillSize, - uint32_t data) + VkBuffer dstBuffer, + VkDeviceSize dstOffset, + VkDeviceSize fillSize, + uint32_t data) { } void tu_CmdCopyBuffer(VkCommandBuffer commandBuffer, - VkBuffer srcBuffer, - VkBuffer destBuffer, - uint32_t regionCount, - const VkBufferCopy *pRegions) + VkBuffer srcBuffer, + VkBuffer destBuffer, + uint32_t regionCount, + const VkBufferCopy *pRegions) { } void tu_CmdUpdateBuffer(VkCommandBuffer commandBuffer, - VkBuffer dstBuffer, - VkDeviceSize dstOffset, - VkDeviceSize dataSize, - const void *pData) + VkBuffer dstBuffer, + VkDeviceSize dstOffset, + VkDeviceSize dataSize, + const void *pData) { } diff --git a/src/freedreno/vulkan/tu_meta_clear.c b/src/freedreno/vulkan/tu_meta_clear.c index c363668d99a..08a14338bc5 100644 --- a/src/freedreno/vulkan/tu_meta_clear.c +++ b/src/freedreno/vulkan/tu_meta_clear.c @@ -25,29 +25,29 @@ void tu_CmdClearColorImage(VkCommandBuffer commandBuffer, - VkImage image_h, - VkImageLayout imageLayout, - const VkClearColorValue *pColor, - uint32_t rangeCount, - const VkImageSubresourceRange *pRanges) + VkImage image_h, + VkImageLayout imageLayout, + const VkClearColorValue *pColor, + uint32_t rangeCount, + const VkImageSubresourceRange *pRanges) { } void tu_CmdClearDepthStencilImage(VkCommandBuffer commandBuffer, - VkImage image_h, - VkImageLayout imageLayout, - const VkClearDepthStencilValue *pDepthStencil, - uint32_t rangeCount, - const VkImageSubresourceRange *pRanges) + VkImage image_h, + VkImageLayout imageLayout, + const VkClearDepthStencilValue *pDepthStencil, + uint32_t rangeCount, + const VkImageSubresourceRange *pRanges) { } void tu_CmdClearAttachments(VkCommandBuffer commandBuffer, - uint32_t attachmentCount, - const VkClearAttachment *pAttachments, - uint32_t rectCount, - const VkClearRect *pRects) + uint32_t attachmentCount, + const VkClearAttachment *pAttachments, + uint32_t rectCount, + const VkClearRect *pRects) { } diff --git a/src/freedreno/vulkan/tu_meta_copy.c b/src/freedreno/vulkan/tu_meta_copy.c index 00d7b247cc8..a6899d5db3c 100644 --- a/src/freedreno/vulkan/tu_meta_copy.c +++ b/src/freedreno/vulkan/tu_meta_copy.c @@ -35,11 +35,11 @@ meta_copy_buffer_to_image(struct tu_cmd_buffer *cmd_buffer, void tu_CmdCopyBufferToImage(VkCommandBuffer commandBuffer, - VkBuffer srcBuffer, - VkImage destImage, - VkImageLayout destImageLayout, - uint32_t regionCount, - const VkBufferImageCopy *pRegions) + VkBuffer srcBuffer, + VkImage destImage, + VkImageLayout destImageLayout, + uint32_t regionCount, + const VkBufferImageCopy *pRegions) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); TU_FROM_HANDLE(tu_image, dest_image, destImage); @@ -65,11 +65,11 @@ meta_copy_image_to_buffer(struct tu_cmd_buffer *cmd_buffer, void tu_CmdCopyImageToBuffer(VkCommandBuffer commandBuffer, - VkImage srcImage, - VkImageLayout srcImageLayout, - VkBuffer destBuffer, - uint32_t regionCount, - const VkBufferImageCopy *pRegions) + VkImage srcImage, + VkImageLayout srcImageLayout, + VkBuffer destBuffer, + uint32_t regionCount, + const VkBufferImageCopy *pRegions) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); TU_FROM_HANDLE(tu_image, src_image, srcImage); @@ -92,12 +92,12 @@ meta_copy_image(struct tu_cmd_buffer *cmd_buffer, void tu_CmdCopyImage(VkCommandBuffer commandBuffer, - VkImage srcImage, - VkImageLayout srcImageLayout, - VkImage destImage, - VkImageLayout destImageLayout, - uint32_t regionCount, - const VkImageCopy *pRegions) + VkImage srcImage, + VkImageLayout srcImageLayout, + VkImage destImage, + VkImageLayout destImageLayout, + uint32_t regionCount, + const VkImageCopy *pRegions) { TU_FROM_HANDLE(tu_cmd_buffer, cmd_buffer, commandBuffer); TU_FROM_HANDLE(tu_image, src_image, srcImage); diff --git a/src/freedreno/vulkan/tu_meta_resolve.c b/src/freedreno/vulkan/tu_meta_resolve.c index e68d00c9700..1de63a33444 100644 --- a/src/freedreno/vulkan/tu_meta_resolve.c +++ b/src/freedreno/vulkan/tu_meta_resolve.c @@ -30,11 +30,11 @@ void tu_CmdResolveImage(VkCommandBuffer cmd_buffer_h, - VkImage src_image_h, - VkImageLayout src_image_layout, - VkImage dest_image_h, - VkImageLayout dest_image_layout, - uint32_t region_count, - const VkImageResolve *regions) + VkImage src_image_h, + VkImageLayout src_image_layout, + VkImage dest_image_h, + VkImageLayout dest_image_layout, + uint32_t region_count, + const VkImageResolve *regions) { } diff --git a/src/freedreno/vulkan/tu_pass.c b/src/freedreno/vulkan/tu_pass.c index e918f2a4470..4e0895bc11a 100644 --- a/src/freedreno/vulkan/tu_pass.c +++ b/src/freedreno/vulkan/tu_pass.c @@ -30,9 +30,9 @@ VkResult tu_CreateRenderPass(VkDevice _device, - const VkRenderPassCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkRenderPass *pRenderPass) + const VkRenderPassCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkRenderPass *pRenderPass) { TU_FROM_HANDLE(tu_device, device, _device); struct tu_render_pass *pass; @@ -217,9 +217,9 @@ tu_CreateRenderPass(VkDevice _device, VkResult tu_CreateRenderPass2KHR(VkDevice _device, - const VkRenderPassCreateInfo2KHR *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkRenderPass *pRenderPass) + const VkRenderPassCreateInfo2KHR *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkRenderPass *pRenderPass) { TU_FROM_HANDLE(tu_device, device, _device); struct tu_render_pass *pass; @@ -392,8 +392,8 @@ tu_CreateRenderPass2KHR(VkDevice _device, void tu_DestroyRenderPass(VkDevice _device, - VkRenderPass _pass, - const VkAllocationCallbacks *pAllocator) + VkRenderPass _pass, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_render_pass, pass, _pass); @@ -406,8 +406,8 @@ tu_DestroyRenderPass(VkDevice _device, void tu_GetRenderAreaGranularity(VkDevice device, - VkRenderPass renderPass, - VkExtent2D *pGranularity) + VkRenderPass renderPass, + VkExtent2D *pGranularity) { pGranularity->width = 1; pGranularity->height = 1; diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c index d6713688ce4..8179b03e89c 100644 --- a/src/freedreno/vulkan/tu_pipeline.c +++ b/src/freedreno/vulkan/tu_pipeline.c @@ -39,12 +39,12 @@ VkResult tu_graphics_pipeline_create( - VkDevice _device, - VkPipelineCache _cache, - const VkGraphicsPipelineCreateInfo *pCreateInfo, - const struct tu_graphics_pipeline_create_info *extra, - const VkAllocationCallbacks *pAllocator, - VkPipeline *pPipeline) + VkDevice _device, + VkPipelineCache _cache, + const VkGraphicsPipelineCreateInfo *pCreateInfo, + const struct tu_graphics_pipeline_create_info *extra, + const VkAllocationCallbacks *pAllocator, + VkPipeline *pPipeline) { return VK_SUCCESS; @@ -52,11 +52,11 @@ tu_graphics_pipeline_create( VkResult tu_CreateGraphicsPipelines(VkDevice _device, - VkPipelineCache pipelineCache, - uint32_t count, - const VkGraphicsPipelineCreateInfo *pCreateInfos, - const VkAllocationCallbacks *pAllocator, - VkPipeline *pPipelines) + VkPipelineCache pipelineCache, + uint32_t count, + const VkGraphicsPipelineCreateInfo *pCreateInfos, + const VkAllocationCallbacks *pAllocator, + VkPipeline *pPipelines) { VkResult result = VK_SUCCESS; unsigned i = 0; @@ -80,21 +80,21 @@ tu_CreateGraphicsPipelines(VkDevice _device, static VkResult tu_compute_pipeline_create(VkDevice _device, - VkPipelineCache _cache, - const VkComputePipelineCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkPipeline *pPipeline) + VkPipelineCache _cache, + const VkComputePipelineCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkPipeline *pPipeline) { return VK_SUCCESS; } VkResult tu_CreateComputePipelines(VkDevice _device, - VkPipelineCache pipelineCache, - uint32_t count, - const VkComputePipelineCreateInfo *pCreateInfos, - const VkAllocationCallbacks *pAllocator, - VkPipeline *pPipelines) + VkPipelineCache pipelineCache, + uint32_t count, + const VkComputePipelineCreateInfo *pCreateInfos, + const VkAllocationCallbacks *pAllocator, + VkPipeline *pPipelines) { VkResult result = VK_SUCCESS; diff --git a/src/freedreno/vulkan/tu_pipeline_cache.c b/src/freedreno/vulkan/tu_pipeline_cache.c index 32470b75aa0..efb63383793 100644 --- a/src/freedreno/vulkan/tu_pipeline_cache.c +++ b/src/freedreno/vulkan/tu_pipeline_cache.c @@ -45,7 +45,7 @@ struct cache_entry void tu_pipeline_cache_init(struct tu_pipeline_cache *cache, - struct tu_device *device) + struct tu_device *device) { cache->device = device; pthread_mutex_init(&cache->mutex, NULL); @@ -89,10 +89,10 @@ entry_size(struct cache_entry *entry) void tu_hash_shaders(unsigned char *hash, - const VkPipelineShaderStageCreateInfo **stages, - const struct tu_pipeline_layout *layout, - const struct tu_pipeline_key *key, - uint32_t flags) + const VkPipelineShaderStageCreateInfo **stages, + const struct tu_pipeline_layout *layout, + const struct tu_pipeline_key *key, + uint32_t flags) { struct mesa_sha1 ctx; @@ -124,7 +124,7 @@ tu_hash_shaders(unsigned char *hash, static struct cache_entry * tu_pipeline_cache_search_unlocked(struct tu_pipeline_cache *cache, - const unsigned char *sha1) + const unsigned char *sha1) { const uint32_t mask = cache->table_size - 1; const uint32_t start = (*(uint32_t *)sha1); @@ -149,7 +149,7 @@ tu_pipeline_cache_search_unlocked(struct tu_pipeline_cache *cache, static struct cache_entry * tu_pipeline_cache_search(struct tu_pipeline_cache *cache, - const unsigned char *sha1) + const unsigned char *sha1) { struct cache_entry *entry; @@ -164,7 +164,7 @@ tu_pipeline_cache_search(struct tu_pipeline_cache *cache, static void tu_pipeline_cache_set_entry(struct tu_pipeline_cache *cache, - struct cache_entry *entry) + struct cache_entry *entry) { const uint32_t mask = cache->table_size - 1; const uint32_t start = entry->sha1_dw[0]; @@ -218,7 +218,7 @@ tu_pipeline_cache_grow(struct tu_pipeline_cache *cache) static void tu_pipeline_cache_add_entry(struct tu_pipeline_cache *cache, - struct cache_entry *entry) + struct cache_entry *entry) { if (cache->kernel_count == cache->table_size / 2) tu_pipeline_cache_grow(cache); @@ -241,8 +241,8 @@ struct cache_header void tu_pipeline_cache_load(struct tu_pipeline_cache *cache, - const void *data, - size_t size) + const void *data, + size_t size) { struct tu_device *device = cache->device; struct cache_header header; @@ -286,9 +286,9 @@ tu_pipeline_cache_load(struct tu_pipeline_cache *cache, VkResult tu_CreatePipelineCache(VkDevice _device, - const VkPipelineCacheCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkPipelineCache *pPipelineCache) + const VkPipelineCacheCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkPipelineCache *pPipelineCache) { TU_FROM_HANDLE(tu_device, device, _device); struct tu_pipeline_cache *cache; @@ -323,8 +323,8 @@ tu_CreatePipelineCache(VkDevice _device, void tu_DestroyPipelineCache(VkDevice _device, - VkPipelineCache _cache, - const VkAllocationCallbacks *pAllocator) + VkPipelineCache _cache, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_pipeline_cache, cache, _cache); @@ -338,9 +338,9 @@ tu_DestroyPipelineCache(VkDevice _device, VkResult tu_GetPipelineCacheData(VkDevice _device, - VkPipelineCache _cache, - size_t *pDataSize, - void *pData) + VkPipelineCache _cache, + size_t *pDataSize, + void *pData) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_pipeline_cache, cache, _cache); @@ -393,7 +393,7 @@ tu_GetPipelineCacheData(VkDevice _device, static void tu_pipeline_cache_merge(struct tu_pipeline_cache *dst, - struct tu_pipeline_cache *src) + struct tu_pipeline_cache *src) { for (uint32_t i = 0; i < src->table_size; i++) { struct cache_entry *entry = src->hash_table[i]; @@ -408,9 +408,9 @@ tu_pipeline_cache_merge(struct tu_pipeline_cache *dst, VkResult tu_MergePipelineCaches(VkDevice _device, - VkPipelineCache destCache, - uint32_t srcCacheCount, - const VkPipelineCache *pSrcCaches) + VkPipelineCache destCache, + uint32_t srcCacheCount, + const VkPipelineCache *pSrcCaches) { TU_FROM_HANDLE(tu_pipeline_cache, dst, destCache); diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h index 35c51ac2c84..5fafcacf9e2 100644 --- a/src/freedreno/vulkan/tu_private.h +++ b/src/freedreno/vulkan/tu_private.h @@ -274,10 +274,10 @@ void * tu_lookup_entrypoint_unchecked(const char *name); void * tu_lookup_entrypoint_checked( - const char *name, - uint32_t core_version, - const struct tu_instance_extension_table *instance, - const struct tu_device_extension_table *device); + const char *name, + uint32_t core_version, + const struct tu_instance_extension_table *instance, + const struct tu_device_extension_table *device); struct tu_physical_device { @@ -334,7 +334,7 @@ uint32_t tu_physical_device_api_version(struct tu_physical_device *dev); bool tu_physical_device_extension_supported(struct tu_physical_device *dev, - const char *name); + const char *name); struct cache_entry; @@ -358,30 +358,30 @@ struct tu_pipeline_key void tu_pipeline_cache_init(struct tu_pipeline_cache *cache, - struct tu_device *device); + struct tu_device *device); void tu_pipeline_cache_finish(struct tu_pipeline_cache *cache); void tu_pipeline_cache_load(struct tu_pipeline_cache *cache, - const void *data, - size_t size); + const void *data, + size_t size); struct tu_shader_variant; bool tu_create_shader_variants_from_pipeline_cache( - struct tu_device *device, - struct tu_pipeline_cache *cache, - const unsigned char *sha1, - struct tu_shader_variant **variants); + struct tu_device *device, + struct tu_pipeline_cache *cache, + const unsigned char *sha1, + struct tu_shader_variant **variants); void tu_pipeline_cache_insert_shaders(struct tu_device *device, - struct tu_pipeline_cache *cache, - const unsigned char *sha1, - struct tu_shader_variant **variants, - const void *const *codes, - const unsigned *code_sizes); + struct tu_pipeline_cache *cache, + const unsigned char *sha1, + struct tu_shader_variant **variants, + const void *const *codes, + const unsigned *code_sizes); struct tu_meta_state { @@ -751,8 +751,8 @@ struct tu_cmd_buffer bool tu_get_memory_fd(struct tu_device *device, - struct tu_device_memory *memory, - int *pFD); + struct tu_device_memory *memory, + int *pFD); /* * Takes x,y,z as exact numbers of invocations, instead of blocks. @@ -763,9 +763,9 @@ tu_get_memory_fd(struct tu_device *device, */ void tu_unaligned_dispatch(struct tu_cmd_buffer *cmd_buffer, - uint32_t x, - uint32_t y, - uint32_t z); + uint32_t x, + uint32_t y, + uint32_t z); struct tu_event { @@ -780,10 +780,10 @@ struct tu_shader_module; #define TU_HASH_SHADER_UNSAFE_MATH (1 << 2) void tu_hash_shaders(unsigned char *hash, - const VkPipelineShaderStageCreateInfo **stages, - const struct tu_pipeline_layout *layout, - const struct tu_pipeline_key *key, - uint32_t flags); + const VkPipelineShaderStageCreateInfo **stages, + const struct tu_pipeline_layout *layout, + const struct tu_pipeline_key *key, + uint32_t flags); static inline gl_shader_stage vk_to_mesa_shader_stage(VkShaderStageFlagBits vk_stage) @@ -827,8 +827,8 @@ struct tu_pipeline struct tu_userdata_info * tu_lookup_user_sgpr(struct tu_pipeline *pipeline, - gl_shader_stage stage, - int idx); + gl_shader_stage stage, + int idx); struct tu_shader_variant * tu_get_shader(struct tu_pipeline *pipeline, gl_shader_stage stage); @@ -848,26 +848,26 @@ struct tu_graphics_pipeline_create_info VkResult tu_graphics_pipeline_create( - VkDevice device, - VkPipelineCache cache, - const VkGraphicsPipelineCreateInfo *pCreateInfo, - const struct tu_graphics_pipeline_create_info *extra, - const VkAllocationCallbacks *alloc, - VkPipeline *pPipeline); + VkDevice device, + VkPipelineCache cache, + const VkGraphicsPipelineCreateInfo *pCreateInfo, + const struct tu_graphics_pipeline_create_info *extra, + const VkAllocationCallbacks *alloc, + VkPipeline *pPipeline); struct vk_format_description; uint32_t tu_translate_buffer_dataformat(const struct vk_format_description *desc, - int first_non_void); + int first_non_void); uint32_t tu_translate_buffer_numformat(const struct vk_format_description *desc, - int first_non_void); + int first_non_void); uint32_t tu_translate_colorformat(VkFormat format); uint32_t tu_translate_color_numformat(VkFormat format, - const struct vk_format_description *desc, - int first_non_void); + const struct vk_format_description *desc, + int first_non_void); uint32_t tu_colorformat_endian_swap(uint32_t colorformat); unsigned @@ -876,16 +876,16 @@ uint32_t tu_translate_dbformat(VkFormat format); uint32_t tu_translate_tex_dataformat(VkFormat format, - const struct vk_format_description *desc, - int first_non_void); -uint32_t -tu_translate_tex_numformat(VkFormat format, const struct vk_format_description *desc, int first_non_void); +uint32_t +tu_translate_tex_numformat(VkFormat format, + const struct vk_format_description *desc, + int first_non_void); bool tu_format_pack_clear_color(VkFormat format, - uint32_t clear_vals[2], - VkClearColorValue *value); + uint32_t clear_vals[2], + VkClearColorValue *value); bool tu_is_colorbuffer_format_supported(VkFormat format, bool *blendable); bool @@ -916,19 +916,19 @@ struct tu_image unsigned tu_image_queue_family_mask(const struct tu_image *image, - uint32_t family, - uint32_t queue_family); + uint32_t family, + uint32_t queue_family); static inline uint32_t tu_get_layerCount(const struct tu_image *image, - const VkImageSubresourceRange *range) + const VkImageSubresourceRange *range) { abort(); } static inline uint32_t tu_get_levelCount(const struct tu_image *image, - const VkImageSubresourceRange *range) + const VkImageSubresourceRange *range) { abort(); } @@ -967,21 +967,21 @@ struct tu_image_create_info VkResult tu_image_create(VkDevice _device, - const struct tu_image_create_info *info, - const VkAllocationCallbacks *alloc, - VkImage *pImage); + const struct tu_image_create_info *info, + const VkAllocationCallbacks *alloc, + VkImage *pImage); VkResult tu_image_from_gralloc(VkDevice device_h, - const VkImageCreateInfo *base_info, - const VkNativeBufferANDROID *gralloc_info, - const VkAllocationCallbacks *alloc, - VkImage *out_image_h); + const VkImageCreateInfo *base_info, + const VkNativeBufferANDROID *gralloc_info, + const VkAllocationCallbacks *alloc, + VkImage *out_image_h); void tu_image_view_init(struct tu_image_view *view, - struct tu_device *device, - const VkImageViewCreateInfo *pCreateInfo); + struct tu_device *device, + const VkImageViewCreateInfo *pCreateInfo); struct tu_buffer_view { @@ -992,12 +992,12 @@ struct tu_buffer_view }; void tu_buffer_view_init(struct tu_buffer_view *view, - struct tu_device *device, - const VkBufferViewCreateInfo *pCreateInfo); + struct tu_device *device, + const VkBufferViewCreateInfo *pCreateInfo); static inline struct VkExtent3D tu_sanitize_image_extent(const VkImageType imageType, - const struct VkExtent3D imageExtent) + const struct VkExtent3D imageExtent) { switch (imageType) { case VK_IMAGE_TYPE_1D: @@ -1013,7 +1013,7 @@ tu_sanitize_image_extent(const VkImageType imageType, static inline struct VkOffset3D tu_sanitize_image_offset(const VkImageType imageType, - const struct VkOffset3D imageOffset) + const struct VkOffset3D imageOffset) { switch (imageType) { case VK_IMAGE_TYPE_1D: @@ -1051,7 +1051,7 @@ struct tu_subpass_barrier void tu_subpass_barrier(struct tu_cmd_buffer *cmd_buffer, - const struct tu_subpass_barrier *barrier); + const struct tu_subpass_barrier *barrier); struct tu_subpass_attachment { @@ -1124,34 +1124,34 @@ struct tu_semaphore void tu_set_descriptor_set(struct tu_cmd_buffer *cmd_buffer, - VkPipelineBindPoint bind_point, - struct tu_descriptor_set *set, - unsigned idx); + VkPipelineBindPoint bind_point, + struct tu_descriptor_set *set, + unsigned idx); void tu_update_descriptor_sets(struct tu_device *device, - struct tu_cmd_buffer *cmd_buffer, - VkDescriptorSet overrideSet, - uint32_t descriptorWriteCount, - const VkWriteDescriptorSet *pDescriptorWrites, - uint32_t descriptorCopyCount, - const VkCopyDescriptorSet *pDescriptorCopies); + struct tu_cmd_buffer *cmd_buffer, + VkDescriptorSet overrideSet, + uint32_t descriptorWriteCount, + const VkWriteDescriptorSet *pDescriptorWrites, + uint32_t descriptorCopyCount, + const VkCopyDescriptorSet *pDescriptorCopies); void tu_update_descriptor_set_with_template( - struct tu_device *device, - struct tu_cmd_buffer *cmd_buffer, - struct tu_descriptor_set *set, - VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, - const void *pData); + struct tu_device *device, + struct tu_cmd_buffer *cmd_buffer, + struct tu_descriptor_set *set, + VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate, + const void *pData); void tu_meta_push_descriptor_set(struct tu_cmd_buffer *cmd_buffer, - VkPipelineBindPoint pipelineBindPoint, - VkPipelineLayout _layout, - uint32_t set, - uint32_t descriptorWriteCount, - const VkWriteDescriptorSet *pDescriptorWrites); + VkPipelineBindPoint pipelineBindPoint, + VkPipelineLayout _layout, + uint32_t set, + uint32_t descriptorWriteCount, + const VkWriteDescriptorSet *pDescriptorWrites); struct tu_fence { diff --git a/src/freedreno/vulkan/tu_query.c b/src/freedreno/vulkan/tu_query.c index 30f47c8ca9d..9b2d76ba0e2 100644 --- a/src/freedreno/vulkan/tu_query.c +++ b/src/freedreno/vulkan/tu_query.c @@ -34,9 +34,9 @@ VkResult tu_CreateQueryPool(VkDevice _device, - const VkQueryPoolCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkQueryPool *pQueryPool) + const VkQueryPoolCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkQueryPool *pQueryPool) { TU_FROM_HANDLE(tu_device, device, _device); struct tu_query_pool *pool = vk_alloc2(&device->alloc, @@ -54,8 +54,8 @@ tu_CreateQueryPool(VkDevice _device, void tu_DestroyQueryPool(VkDevice _device, - VkQueryPool _pool, - const VkAllocationCallbacks *pAllocator) + VkQueryPool _pool, + const VkAllocationCallbacks *pAllocator) { TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_query_pool, pool, _pool); @@ -68,56 +68,56 @@ tu_DestroyQueryPool(VkDevice _device, VkResult tu_GetQueryPoolResults(VkDevice _device, - VkQueryPool queryPool, - uint32_t firstQuery, - uint32_t queryCount, - size_t dataSize, - void *pData, - VkDeviceSize stride, - VkQueryResultFlags flags) + VkQueryPool queryPool, + uint32_t firstQuery, + uint32_t queryCount, + size_t dataSize, + void *pData, + VkDeviceSize stride, + VkQueryResultFlags flags) { return VK_SUCCESS; } void tu_CmdCopyQueryPoolResults(VkCommandBuffer commandBuffer, - VkQueryPool queryPool, - uint32_t firstQuery, - uint32_t queryCount, - VkBuffer dstBuffer, - VkDeviceSize dstOffset, - VkDeviceSize stride, - VkQueryResultFlags flags) + VkQueryPool queryPool, + uint32_t firstQuery, + uint32_t queryCount, + VkBuffer dstBuffer, + VkDeviceSize dstOffset, + VkDeviceSize stride, + VkQueryResultFlags flags) { } void tu_CmdResetQueryPool(VkCommandBuffer commandBuffer, - VkQueryPool queryPool, - uint32_t firstQuery, - uint32_t queryCount) + VkQueryPool queryPool, + uint32_t firstQuery, + uint32_t queryCount) { } void tu_CmdBeginQuery(VkCommandBuffer commandBuffer, - VkQueryPool queryPool, - uint32_t query, - VkQueryControlFlags flags) + VkQueryPool queryPool, + uint32_t query, + VkQueryControlFlags flags) { } void tu_CmdEndQuery(VkCommandBuffer commandBuffer, - VkQueryPool queryPool, - uint32_t query) + VkQueryPool queryPool, + uint32_t query) { } void tu_CmdWriteTimestamp(VkCommandBuffer commandBuffer, - VkPipelineStageFlagBits pipelineStage, - VkQueryPool queryPool, - uint32_t query) + VkPipelineStageFlagBits pipelineStage, + VkQueryPool queryPool, + uint32_t query) { } diff --git a/src/freedreno/vulkan/vk_format.h b/src/freedreno/vulkan/vk_format.h index bab0eda2076..75b7fbd05b3 100644 --- a/src/freedreno/vulkan/vk_format.h +++ b/src/freedreno/vulkan/vk_format.h @@ -262,8 +262,8 @@ vk_format_aspects(VkFormat format) static inline enum vk_swizzle tu_swizzle_conv(VkComponentSwizzle component, - const unsigned char chan[4], - VkComponentSwizzle vk_swiz) + const unsigned char chan[4], + VkComponentSwizzle vk_swiz) { int x;