From f57af8fe1c6af6f1e609708b3d8062b1a1c992c1 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Mon, 29 Apr 2024 09:24:35 +0200 Subject: [PATCH] panvk: clang-format fixups Reconcile recent modifications with clang-format. Signed-off-by: Boris Brezillon Reviewed-by: Mary Guillemard Acked-by: Erik Faye-Lund Part-of: --- src/panfrost/vulkan/panvk_descriptor_set.h | 13 +++----- src/panfrost/vulkan/panvk_pipeline_layout.h | 9 ++---- src/panfrost/vulkan/panvk_vX_cmd_buffer.c | 31 ++++++++++--------- src/panfrost/vulkan/panvk_vX_descriptor_set.c | 7 +++-- .../vulkan/panvk_vX_descriptor_set_layout.c | 1 - src/panfrost/vulkan/panvk_vX_image_view.c | 3 +- src/panfrost/vulkan/panvk_vX_pipeline.c | 3 +- .../vulkan/panvk_vX_pipeline_layout.c | 2 +- src/panfrost/vulkan/panvk_vX_sampler.c | 6 ++-- src/panfrost/vulkan/panvk_vX_shader.c | 2 +- 10 files changed, 36 insertions(+), 41 deletions(-) diff --git a/src/panfrost/vulkan/panvk_descriptor_set.h b/src/panfrost/vulkan/panvk_descriptor_set.h index 0be92812f76..846a04028aa 100644 --- a/src/panfrost/vulkan/panvk_descriptor_set.h +++ b/src/panfrost/vulkan/panvk_descriptor_set.h @@ -91,19 +91,16 @@ struct panvk_push_descriptor_set { }; #ifdef PAN_ARCH -void -panvk_per_arch(push_descriptor_set_assign_layout)( +void panvk_per_arch(push_descriptor_set_assign_layout)( struct panvk_push_descriptor_set *push_set, const struct panvk_descriptor_set_layout *layout); -void -panvk_per_arch(push_descriptor_set)( +void panvk_per_arch(push_descriptor_set)( struct panvk_push_descriptor_set *push_set, - const struct panvk_descriptor_set_layout *layout, - uint32_t write_count, const VkWriteDescriptorSet *writes); + const struct panvk_descriptor_set_layout *layout, uint32_t write_count, + const VkWriteDescriptorSet *writes); -void -panvk_per_arch(push_descriptor_set_with_template)( +void panvk_per_arch(push_descriptor_set_with_template)( struct panvk_push_descriptor_set *push_set, const struct panvk_descriptor_set_layout *layout, VkDescriptorUpdateTemplate templ, const void *data); diff --git a/src/panfrost/vulkan/panvk_pipeline_layout.h b/src/panfrost/vulkan/panvk_pipeline_layout.h index 39c748453ea..bcb89feecba 100644 --- a/src/panfrost/vulkan/panvk_pipeline_layout.h +++ b/src/panfrost/vulkan/panvk_pipeline_layout.h @@ -60,16 +60,13 @@ unsigned panvk_per_arch(pipeline_layout_ubo_index)( const struct panvk_pipeline_layout *layout, unsigned set, unsigned binding, unsigned array_index); -unsigned -panvk_per_arch(pipeline_layout_dyn_desc_ubo_index)( +unsigned panvk_per_arch(pipeline_layout_dyn_desc_ubo_index)( const struct panvk_pipeline_layout *layout); -unsigned -panvk_per_arch(pipeline_layout_dyn_ubos_offset)( +unsigned panvk_per_arch(pipeline_layout_dyn_ubos_offset)( const struct panvk_pipeline_layout *layout); -unsigned -panvk_per_arch(pipeline_layout_total_ubo_count)( +unsigned panvk_per_arch(pipeline_layout_total_ubo_count)( const struct panvk_pipeline_layout *layout); #endif diff --git a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c index ba4a7590408..2ffb63a4bbc 100644 --- a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c +++ b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c @@ -321,8 +321,8 @@ panvk_cmd_prepare_push_uniforms( if (desc_state->push_uniforms) return; - struct panfrost_ptr push_uniforms = pan_pool_alloc_aligned( - &cmdbuf->desc_pool.base, 512, 16); + struct panfrost_ptr push_uniforms = + pan_pool_alloc_aligned(&cmdbuf->desc_pool.base, 512, 16); /* The first half is used for push constants. */ memcpy(push_uniforms.cpu, cmdbuf->push_constants, @@ -355,8 +355,8 @@ panvk_cmd_prepare_push_sets(struct panvk_cmd_buffer *cmdbuf, struct panvk_descriptor_set *set = &desc_state->push_sets[i]->set; - panvk_per_arch(push_descriptor_set_assign_layout)(desc_state->push_sets[i], - slayout); + panvk_per_arch(push_descriptor_set_assign_layout)( + desc_state->push_sets[i], slayout); if (slayout->desc_ubo_size) { struct panfrost_ptr desc_ubo = pan_pool_alloc_aligned( &cmdbuf->desc_pool.base, slayout->desc_ubo_size, 16); @@ -377,13 +377,15 @@ panvk_cmd_prepare_push_sets(struct panvk_cmd_buffer *cmdbuf, } static void -panvk_cmd_unprepare_push_sets(struct panvk_cmd_buffer *cmdbuf, - struct panvk_cmd_bind_point_state *bind_point_state) +panvk_cmd_unprepare_push_sets( + struct panvk_cmd_buffer *cmdbuf, + struct panvk_cmd_bind_point_state *bind_point_state) { struct panvk_descriptor_state *desc_state = &bind_point_state->desc_state; for (unsigned i = 0; i < ARRAY_SIZE(desc_state->sets); i++) { - if (desc_state->push_sets[i] && &desc_state->push_sets[i]->set == desc_state->sets[i]) + if (desc_state->push_sets[i] && + &desc_state->push_sets[i]->set == desc_state->sets[i]) desc_state->sets[i] = NULL; } } @@ -1783,8 +1785,7 @@ panvk_per_arch(CmdDispatch)(VkCommandBuffer commandBuffer, uint32_t x, panfrost_query_core_count(&phys_dev->kmod.props, &core_id_range); batch->tlsinfo.wls.instances = pan_wls_instances(&dispatch.wg_count); batch->wls_total_size = pan_wls_adjust_size(batch->tlsinfo.wls.size) * - batch->tlsinfo.wls.instances * - core_id_range; + batch->tlsinfo.wls.instances * core_id_range; } panvk_per_arch(cmd_close_batch)(cmdbuf); @@ -2017,8 +2018,8 @@ panvk_emit_dyn_ubo(struct panvk_descriptor_state *desc_state, &desc_set->dyn_ubos[dyn_ubo_idx + array_idx]; mali_ptr address = panvk_buffer_gpu_ptr(bdesc->buffer, bdesc->offset + dyn_offset); - size_t size = panvk_buffer_range(bdesc->buffer, - bdesc->offset + dyn_offset, bdesc->size); + size_t size = panvk_buffer_range(bdesc->buffer, bdesc->offset + dyn_offset, + bdesc->size); if (size) { pan_pack(ubo, UNIFORM_BUFFER, cfg) { @@ -2047,7 +2048,7 @@ panvk_emit_dyn_ssbo(struct panvk_descriptor_state *desc_state, const struct panvk_buffer_desc *bdesc = &desc_set->dyn_ssbos[dyn_ssbo_idx + array_idx]; - *ssbo = (struct panvk_ssbo_addr) { + *ssbo = (struct panvk_ssbo_addr){ .base_addr = panvk_buffer_gpu_ptr(bdesc->buffer, bdesc->offset + dyn_offset), .size = panvk_buffer_range(bdesc->buffer, bdesc->offset + dyn_offset, @@ -2326,8 +2327,7 @@ panvk_per_arch(CmdDispatchIndirect)(VkCommandBuffer commandBuffer, static struct panvk_push_descriptor_set * panvk_cmd_push_descriptors(struct panvk_cmd_buffer *cmdbuf, - VkPipelineBindPoint bind_point, - uint32_t set) + VkPipelineBindPoint bind_point, uint32_t set) { struct panvk_cmd_bind_point_state *bind_point_state = &cmdbuf->bind_points[bind_point]; @@ -2383,7 +2383,8 @@ panvk_per_arch(CmdPushDescriptorSetWithTemplateKHR)( VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, uint32_t set, const void *pData) { - VK_FROM_HANDLE(vk_descriptor_update_template, template, descriptorUpdateTemplate); + VK_FROM_HANDLE(vk_descriptor_update_template, template, + descriptorUpdateTemplate); VK_FROM_HANDLE(panvk_cmd_buffer, cmdbuf, commandBuffer); VK_FROM_HANDLE(panvk_pipeline_layout, playout, layout); const struct panvk_descriptor_set_layout *set_layout = diff --git a/src/panfrost/vulkan/panvk_vX_descriptor_set.c b/src/panfrost/vulkan/panvk_vX_descriptor_set.c index 360a43e956c..0a784b70834 100644 --- a/src/panfrost/vulkan/panvk_vX_descriptor_set.c +++ b/src/panfrost/vulkan/panvk_vX_descriptor_set.c @@ -925,7 +925,8 @@ panvk_per_arch(UpdateDescriptorSetWithTemplate)( { VK_FROM_HANDLE(panvk_descriptor_set, set, descriptorSet); - panvk_descriptor_set_update_with_template(set, descriptorUpdateTemplate, data); + panvk_descriptor_set_update_with_template(set, descriptorUpdateTemplate, + data); } void @@ -972,8 +973,8 @@ panvk_per_arch(push_descriptor_set_assign_layout)( void panvk_per_arch(push_descriptor_set)( struct panvk_push_descriptor_set *push_set, - const struct panvk_descriptor_set_layout *layout, - uint32_t write_count, const VkWriteDescriptorSet *writes) + const struct panvk_descriptor_set_layout *layout, uint32_t write_count, + const VkWriteDescriptorSet *writes) { panvk_per_arch(push_descriptor_set_assign_layout)(push_set, layout); for (unsigned i = 0; i < write_count; i++) { diff --git a/src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c b/src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c index 8849ff2e967..287af23c204 100644 --- a/src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c +++ b/src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c @@ -213,7 +213,6 @@ panvk_per_arch(CreateDescriptorSetLayout)( unreachable("Invalid descriptor type"); } - if (binding_layout->type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC) { binding_layout->desc_ubo_offset = dyn_desc_ubo_size; dyn_desc_ubo_size += diff --git a/src/panfrost/vulkan/panvk_vX_image_view.c b/src/panfrost/vulkan/panvk_vX_image_view.c index b93bfde94d2..c40700c5097 100644 --- a/src/panfrost/vulkan/panvk_vX_image_view.c +++ b/src/panfrost/vulkan/panvk_vX_image_view.c @@ -137,8 +137,7 @@ panvk_per_arch(CreateImageView)(VkDevice _device, util_format_compose_swizzles(r001, view->pview.swizzle, pview.swizzle); } - unsigned bo_size = - GENX(panfrost_estimate_texture_payload_size)(&pview); + unsigned bo_size = GENX(panfrost_estimate_texture_payload_size)(&pview); view->bo = panvk_priv_bo_create(device, bo_size, 0, pAllocator, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); diff --git a/src/panfrost/vulkan/panvk_vX_pipeline.c b/src/panfrost/vulkan/panvk_vX_pipeline.c index 395a27f7f3d..7ce7cb51a07 100644 --- a/src/panfrost/vulkan/panvk_vX_pipeline.c +++ b/src/panfrost/vulkan/panvk_vX_pipeline.c @@ -1054,7 +1054,8 @@ panvk_pipeline_builder_init_graphics( subpass->depth_stencil_attachment->attachment != VK_ATTACHMENT_UNUSED; assert(!subpass->color_count || - subpass->color_count <= create_info->pColorBlendState->attachmentCount); + subpass->color_count <= + create_info->pColorBlendState->attachmentCount); builder->active_color_attachments = 0; for (uint32_t i = 0; i < subpass->color_count; i++) { uint32_t idx = subpass->color_attachments[i].attachment; diff --git a/src/panfrost/vulkan/panvk_vX_pipeline_layout.c b/src/panfrost/vulkan/panvk_vX_pipeline_layout.c index 3f180a5802b..da875df9fa2 100644 --- a/src/panfrost/vulkan/panvk_vX_pipeline_layout.c +++ b/src/panfrost/vulkan/panvk_vX_pipeline_layout.c @@ -8,8 +8,8 @@ #include "vk_log.h" -#include "panvk_device.h" #include "panvk_descriptor_set.h" +#include "panvk_device.h" #include "panvk_entrypoints.h" #include "panvk_macros.h" #include "panvk_pipeline_layout.h" diff --git a/src/panfrost/vulkan/panvk_vX_sampler.c b/src/panfrost/vulkan/panvk_vX_sampler.c index 42e7ecbd0d1..8be4742deba 100644 --- a/src/panfrost/vulkan/panvk_vX_sampler.c +++ b/src/panfrost/vulkan/panvk_vX_sampler.c @@ -127,9 +127,9 @@ panvk_per_arch(CreateSampler)(VkDevice _device, * that works for normalized_coordinates=false. */ cfg.wrap_mode_r = - pCreateInfo->unnormalizedCoordinates ? - MALI_WRAP_MODE_CLAMP_TO_EDGE : - panvk_translate_sampler_address_mode(pCreateInfo->addressModeW); + pCreateInfo->unnormalizedCoordinates + ? MALI_WRAP_MODE_CLAMP_TO_EDGE + : panvk_translate_sampler_address_mode(pCreateInfo->addressModeW); cfg.compare_function = panvk_translate_sampler_compare_func(pCreateInfo); cfg.border_color_r = border_color.uint32[0]; cfg.border_color_g = border_color.uint32[1]; diff --git a/src/panfrost/vulkan/panvk_vX_shader.c b/src/panfrost/vulkan/panvk_vX_shader.c index 77d6d0680e5..1388ed2355f 100644 --- a/src/panfrost/vulkan/panvk_vX_shader.c +++ b/src/panfrost/vulkan/panvk_vX_shader.c @@ -79,7 +79,7 @@ panvk_lower_sysvals(nir_builder *b, nir_instr *instr, void *data) nir_def *val = NULL; b->cursor = nir_before_instr(instr); -#define SYSVAL(ptype, name) offsetof(struct panvk_ ## ptype ## _sysvals, name) +#define SYSVAL(ptype, name) offsetof(struct panvk_##ptype##_sysvals, name) switch (intr->intrinsic) { case nir_intrinsic_load_num_workgroups: val =