From 082871bb3550846993ac6529df49f6bb97ca6f83 Mon Sep 17 00:00:00 2001
From: Connor Abbott <cwabbott0@gmail.com>
Date: Mon, 12 Jul 2021 12:42:40 +0200
Subject: [PATCH] freedreno: Add some options to .clang-format

In preparation for reformatting ir3.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11801>
---
 src/freedreno/.clang-format | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/freedreno/.clang-format b/src/freedreno/.clang-format
index 4a5a4ba253f..d783419a34b 100644
--- a/src/freedreno/.clang-format
+++ b/src/freedreno/.clang-format
@@ -1,5 +1,6 @@
 AlignAfterOpenBracket: true
 AlignConsecutiveMacros: true
+AlignConsecutiveBitFields: true
 AllowAllArgumentsOnNextLine: false
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: false
@@ -19,17 +20,28 @@ ColumnLimit: 80
 ContinuationIndentWidth: 3
 Cpp11BracedListStyle: false
 Cpp11BracedListStyle: true
+BreakStringLiterals: false
 ForEachMacros:
+  - BITSET_FOREACH_SET
+  - BITSET_FOREACH_RANGE
   - LIST_FOR_EACH_ENTRY
   - LIST_FOR_EACH_ENTRY_SAFE
   - LIST_FOR_EACH_ENTRY_SAFE_REV
   - list_for_each_entry
   - list_for_each_entry_safe
+  - list_for_each_entry_rev
+  - list_for_each_entry_rev_safe
+  - list_for_each_entry_from
+  - list_for_each_entry_from_rev
   - foreach_list_typed
   - u_foreach_bit
   - util_dynarray_foreach
+  - rb_tree_foreach
+  - rb_tree_foreach_safe
   - nir_foreach_variable
   - nir_foreach_variable_safe
+  - nir_foreach_uniform_variable
+  - nir_foreach_uniform_variable_safe
   - nir_foreach_register
   - nir_foreach_register_safe
   - nir_foreach_use
@@ -45,6 +57,7 @@ ForEachMacros:
   - nir_foreach_instr_reverse
   - nir_foreach_instr_safe
   - nir_foreach_instr_reverse_safe
+  - nir_foreach_instr_from_safe
   - nir_foreach_function
   - nir_foreach_block
   - nir_foreach_block_safe
@@ -54,7 +67,6 @@ ForEachMacros:
   - nir_foreach_shader_in_variable
   - nir_foreach_shader_out_variable_safe
   - nir_foreach_variable_in_list
-  - nir_foreach_src
   - nir_foreach_variable_with_modes_safe
   - nir_foreach_variable_with_modes
   - nir_foreach_shader_out_variable
@@ -69,6 +81,9 @@ ForEachMacros:
   - foreach_src_n
   - foreach_dst
   - foreach_dst_n
+  - ra_foreach_dst
+  - ra_foreach_src
+  - ra_foreach_src_rev
   - foreach_ssa_use
   - foreach_ssa_srcp_n
   - foreach_ssa_srcp
@@ -81,6 +96,7 @@ ForEachMacros:
   - foreach_instr
   - foreach_instr_rev
   - foreach_instr_safe
+  - foreach_instr_from_safe
   - foreach_block
   - foreach_block_safe
   - foreach_block_rev
@@ -90,6 +106,10 @@ ForEachMacros:
   - foreach_name
   - foreach_def
   - foreach_use
+  - foreach_interval
+  - foreach_interval_safe
+  - foreach_interval_rev
+  - foreach_interval_rev_safe
   - foreach_batch
   - hash_table_foreach
   - set_foreach