Module: Mesa Branch: main Commit: 6439edd6443fd2a9271ddd3754550edde1c46d0c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6439edd6443fd2a9271ddd3754550edde1c46d0c
Author: Konstantin Seurer <[email protected]> Date: Sat May 27 11:22:45 2023 +0200 panfrost: Reformat using the new style Now, that the foreach macro list is complete (I hope), let's reformat drivers that enforce correct formatting in CI. Acked-by: Alyssa Rosenzweig <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Acked-by: Boris Brezillon <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23275> --- src/panfrost/compiler/bi_print.c | 3 ++- src/panfrost/compiler/bi_ra.c | 3 +-- src/panfrost/compiler/bi_test.h | 6 ++---- src/panfrost/midgard/midgard_schedule.c | 3 +-- src/panfrost/vulkan/panvk_device.c | 3 +-- src/panfrost/vulkan/panvk_formats.c | 6 ++---- src/panfrost/vulkan/panvk_pass.c | 3 +-- 7 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/panfrost/compiler/bi_print.c b/src/panfrost/compiler/bi_print.c index 5d997c79dd3..2ef8a81a4a7 100644 --- a/src/panfrost/compiler/bi_print.c +++ b/src/panfrost/compiler/bi_print.c @@ -138,7 +138,8 @@ bi_print_scoreboard_line(unsigned slot, const char *name, uint64_t mask, fprintf(fp, "slot %u %s:", slot, name); - u_foreach_bit64(reg, mask) fprintf(fp, " r%" PRId64, reg); + u_foreach_bit64(reg, mask) + fprintf(fp, " r%" PRId64, reg); fprintf(fp, "\n"); } diff --git a/src/panfrost/compiler/bi_ra.c b/src/panfrost/compiler/bi_ra.c index 34047cdcf3e..6dc73650758 100644 --- a/src/panfrost/compiler/bi_ra.c +++ b/src/panfrost/compiler/bi_ra.c @@ -171,8 +171,7 @@ lcra_solve(struct lcra_state *l) bool succ = false; - u_foreach_bit64(r, l->affinity[step]) - { + u_foreach_bit64(r, l->affinity[step]) { l->solutions[step] = r; if (lcra_test_linear(l, l->solutions, step)) { diff --git a/src/panfrost/compiler/bi_test.h b/src/panfrost/compiler/bi_test.h index 00247c10e25..4dbc4a59088 100644 --- a/src/panfrost/compiler/bi_test.h +++ b/src/panfrost/compiler/bi_test.h @@ -89,8 +89,7 @@ bit_block_equal(bi_block *A, bi_block *B) return false; list_pair_for_each_entry(bi_instr, insA, insB, &A->instructions, - &B->instructions, link) - { + &B->instructions, link) { if (!bit_instr_equal(insA, insB)) return false; } @@ -105,8 +104,7 @@ bit_shader_equal(bi_context *A, bi_context *B) return false; list_pair_for_each_entry(bi_block, blockA, blockB, &A->blocks, &B->blocks, - link) - { + link) { if (!bit_block_equal(blockA, blockB)) return false; } diff --git a/src/panfrost/midgard/midgard_schedule.c b/src/panfrost/midgard/midgard_schedule.c index ad10fbbc94d..7d0ebd99392 100644 --- a/src/panfrost/midgard/midgard_schedule.c +++ b/src/panfrost/midgard/midgard_schedule.c @@ -1504,8 +1504,7 @@ schedule_block(compiler_context *ctx, midgard_block *block) /* We emitted bundles backwards; copy into the block in reverse-order */ util_dynarray_init(&block->bundles, block); - util_dynarray_foreach_reverse(&bundles, midgard_bundle, bundle) - { + util_dynarray_foreach_reverse(&bundles, midgard_bundle, bundle) { util_dynarray_append(&block->bundles, midgard_bundle, *bundle); } util_dynarray_fini(&bundles); diff --git a/src/panfrost/vulkan/panvk_device.c b/src/panfrost/vulkan/panvk_device.c index 1ee18ee38fc..9a36ba8eb30 100644 --- a/src/panfrost/vulkan/panvk_device.c +++ b/src/panfrost/vulkan/panvk_device.c @@ -698,8 +698,7 @@ panvk_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_PROPERTIES, }; - vk_foreach_struct(ext, pProperties->pNext) - { + vk_foreach_struct(ext, pProperties->pNext) { if (vk_get_physical_device_core_1_1_property_ext(ext, &core_1_1)) continue; if (vk_get_physical_device_core_1_2_property_ext(ext, &core_1_2)) diff --git a/src/panfrost/vulkan/panvk_formats.c b/src/panfrost/vulkan/panvk_formats.c index 4963b18672f..7d41da6f7dc 100644 --- a/src/panfrost/vulkan/panvk_formats.c +++ b/src/panfrost/vulkan/panvk_formats.c @@ -377,8 +377,7 @@ panvk_GetPhysicalDeviceImageFormatProperties2( return result; /* Extract input structs */ - vk_foreach_struct_const(s, base_info->pNext) - { + vk_foreach_struct_const(s, base_info->pNext) { switch (s->sType) { case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO: external_info = (const void *)s; @@ -392,8 +391,7 @@ panvk_GetPhysicalDeviceImageFormatProperties2( } /* Extract output structs */ - vk_foreach_struct(s, base_props->pNext) - { + vk_foreach_struct(s, base_props->pNext) { switch (s->sType) { case VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES: external_props = (void *)s; diff --git a/src/panfrost/vulkan/panvk_pass.c b/src/panfrost/vulkan/panvk_pass.c index ea5d8f91e28..1abe6c63b3f 100644 --- a/src/panfrost/vulkan/panvk_pass.c +++ b/src/panfrost/vulkan/panvk_pass.c @@ -58,8 +58,7 @@ panvk_CreateRenderPass2(VkDevice _device, pass->subpass_count = pCreateInfo->subpassCount; pass->attachments = (void *)pass + attachments_offset; - vk_foreach_struct_const(ext, pCreateInfo->pNext) - { + vk_foreach_struct_const(ext, pCreateInfo->pNext) { switch (ext->sType) { case VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO: multiview_info = (VkRenderPassMultiviewCreateInfo *)ext;
