From f3c3b99e606c9d2bba009a75725e24a98ea737e5 Mon Sep 17 00:00:00 2001
From: Yonggang Luo <luoyonggang@gmail.com>
Date: Mon, 8 Sep 2025 22:16:51 +0800
Subject: [PATCH] clang-format: Move ForEachMacros into src/.clang-format for
 freedreno

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37235>
---
 src/.clang-format                  | 55 ++++++++++++++++++++++++++++++
 src/freedreno/.clang-format        | 51 ---------------------------
 src/freedreno/vulkan/.clang-format |  3 --
 3 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/src/.clang-format b/src/.clang-format
index beeff13a96d..beb26c8d3b2 100644
--- a/src/.clang-format
+++ b/src/.clang-format
@@ -48,10 +48,14 @@ IncludeCategories:
     Priority:        3
 
 ForEachMacros:
+# There is no way to extend ForEachMacros
+# The issue tracker https://github.com/llvm/llvm-project/issues/84359
 # util
   - u_foreach_bit
   - u_foreach_bit64
 
+  - u_vector_foreach
+
   - BITSET_FOREACH_SET
   - BITSET_FOREACH_RANGE
 
@@ -239,6 +243,57 @@ ForEachMacros:
   - PHASE
   - radv_foreach_stage
 
+# freedreno
+  - ir2_foreach_instr
+  - ir2_foreach_live_reg
+  - ir2_foreach_avail
+  - ir2_foreach_src
+  - foreach_batch
+  - perf_time
+  - perf_time_ctx
+  - foreach_sched_node
+  - foreach_src
+  - foreach_src_n
+  - foreach_src_if
+  - foreach_src_with_alias_n
+  - foreach_src_in_alias_group_n
+  - foreach_src_in_alias_group
+  - foreach_dst
+  - foreach_dst_n
+  - foreach_dst_if
+  - ra_foreach_dst
+  - ra_foreach_src
+  - ra_foreach_src_rev
+  - foreach_ssa_use
+  - foreach_ssa_srcp_n
+  - foreach_ssa_srcp
+  - foreach_ssa_src_n
+  - foreach_ssa_src
+  - foreach_input_n
+  - foreach_input
+  - foreach_instr
+  - foreach_instr_rev
+  - foreach_instr_safe
+  - foreach_instr_from
+  - foreach_instr_from_safe
+  - foreach_block
+  - foreach_block_safe
+  - foreach_block_rev
+  - foreach_array
+  - foreach_array_safe
+  - foreach_interval
+  - foreach_interval_safe
+  - foreach_interval_rev
+  - foreach_interval_rev_safe
+  - foreach_line_in_section
+  - foreach_submit
+  - foreach_submit_safe
+  - foreach_instr_rpt
+  - foreach_instr_rpt_excl
+  - foreach_instr_rpt_excl_safe
+  - foreach_bo
+  - foreach_bo_safe
+
 # Disable clang formatting by default. Drivers that use clang-format
 # inherit from this .clang-format file and re-enable formatting:
 #
diff --git a/src/freedreno/.clang-format b/src/freedreno/.clang-format
index 13e3a491d2d..630f8482740 100644
--- a/src/freedreno/.clang-format
+++ b/src/freedreno/.clang-format
@@ -5,54 +5,3 @@ DisableFormat: false
 AlignConsecutiveBitFields: Consecutive
 ColumnLimit: 80
 BreakStringLiterals: false
-
-ForEachMacros:
-  - ir2_foreach_instr
-  - ir2_foreach_live_reg
-  - ir2_foreach_avail
-  - ir2_foreach_src
-  - foreach_batch
-  - perf_time
-  - perf_time_ctx
-  - foreach_sched_node
-  - foreach_src
-  - foreach_src_n
-  - foreach_src_if
-  - foreach_src_with_alias_n
-  - foreach_src_in_alias_group_n
-  - foreach_src_in_alias_group
-  - foreach_dst
-  - foreach_dst_n
-  - foreach_dst_if
-  - ra_foreach_dst
-  - ra_foreach_src
-  - ra_foreach_src_rev
-  - foreach_ssa_use
-  - foreach_ssa_srcp_n
-  - foreach_ssa_srcp
-  - foreach_ssa_src_n
-  - foreach_ssa_src
-  - foreach_input_n
-  - foreach_input
-  - foreach_instr
-  - foreach_instr_rev
-  - foreach_instr_safe
-  - foreach_instr_from
-  - foreach_instr_from_safe
-  - foreach_block
-  - foreach_block_safe
-  - foreach_block_rev
-  - foreach_array
-  - foreach_array_safe
-  - foreach_interval
-  - foreach_interval_safe
-  - foreach_interval_rev
-  - foreach_interval_rev_safe
-  - foreach_line_in_section
-  - foreach_submit
-  - foreach_submit_safe
-  - foreach_instr_rpt
-  - foreach_instr_rpt_excl
-  - foreach_instr_rpt_excl_safe
-  - foreach_bo
-  - foreach_bo_safe
diff --git a/src/freedreno/vulkan/.clang-format b/src/freedreno/vulkan/.clang-format
index 8a1ae374067..f7f9e5755db 100644
--- a/src/freedreno/vulkan/.clang-format
+++ b/src/freedreno/vulkan/.clang-format
@@ -20,8 +20,5 @@ IncludeCategories:
   - Regex:           '.*'
     Priority:        1
 
-ForEachMacros:
-  - u_vector_foreach
-
 SpaceAfterCStyleCast: true
 SpaceBeforeCpp11BracedList: true