From d93acf100193cb29806f82a1bf5453a7005583a5 Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Mon, 10 May 2021 15:10:05 -0700
Subject: [PATCH] freedreno: Update editorconfig and emacs settings for
 freedreno reformat.

Fixes: 2d439343ea1a ("freedreno: Re-indent")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10742>
---
 src/freedreno/.dir-locals.el                 |  6 +++---
 src/freedreno/.editorconfig                  |  8 ++++----
 src/freedreno/ir3/.dir-locals.el             | 11 +++++++++++
 src/freedreno/ir3/.editorconfig              |  5 +++++
 src/gallium/drivers/freedreno/.dir-locals.el |  6 +++---
 src/gallium/drivers/freedreno/.editorconfig  |  6 +++---
 6 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 src/freedreno/ir3/.dir-locals.el
 create mode 100644 src/freedreno/ir3/.editorconfig

diff --git a/src/freedreno/.dir-locals.el b/src/freedreno/.dir-locals.el
index 3023c51e8cf..09fd6528ee6 100644
--- a/src/freedreno/.dir-locals.el
+++ b/src/freedreno/.dir-locals.el
@@ -1,7 +1,7 @@
 ((prog-mode
-  (indent-tabs-mode . t)
-  (tab-width . 4)
-  (c-basic-offset . 4)
+  (indent-tabs-mode . nil)
+  (tab-width . 3)
+  (c-basic-offset . 3)
   (c-file-style . "k&r")
   (fill-column . 78)
   (c-file-offsets
diff --git a/src/freedreno/.editorconfig b/src/freedreno/.editorconfig
index 5dff7105197..8675fb4bed5 100644
--- a/src/freedreno/.editorconfig
+++ b/src/freedreno/.editorconfig
@@ -1,5 +1,5 @@
-[*.{c,h,cpp,hpp,cc,hh}]
-indent_style = tab
-indent_size = 4
-tab_width = 4
+[*.{c,h}]
+indent_style = space
+indent_size = 3
+tab_width = 3
 max_line_length = 78
diff --git a/src/freedreno/ir3/.dir-locals.el b/src/freedreno/ir3/.dir-locals.el
new file mode 100644
index 00000000000..3023c51e8cf
--- /dev/null
+++ b/src/freedreno/ir3/.dir-locals.el
@@ -0,0 +1,11 @@
+((prog-mode
+  (indent-tabs-mode . t)
+  (tab-width . 4)
+  (c-basic-offset . 4)
+  (c-file-style . "k&r")
+  (fill-column . 78)
+  (c-file-offsets
+   (arglist-cont-nonempty . ++)
+   )
+  )
+ )
diff --git a/src/freedreno/ir3/.editorconfig b/src/freedreno/ir3/.editorconfig
new file mode 100644
index 00000000000..5dff7105197
--- /dev/null
+++ b/src/freedreno/ir3/.editorconfig
@@ -0,0 +1,5 @@
+[*.{c,h,cpp,hpp,cc,hh}]
+indent_style = tab
+indent_size = 4
+tab_width = 4
+max_line_length = 78
diff --git a/src/gallium/drivers/freedreno/.dir-locals.el b/src/gallium/drivers/freedreno/.dir-locals.el
index 3023c51e8cf..09fd6528ee6 100644
--- a/src/gallium/drivers/freedreno/.dir-locals.el
+++ b/src/gallium/drivers/freedreno/.dir-locals.el
@@ -1,7 +1,7 @@
 ((prog-mode
-  (indent-tabs-mode . t)
-  (tab-width . 4)
-  (c-basic-offset . 4)
+  (indent-tabs-mode . nil)
+  (tab-width . 3)
+  (c-basic-offset . 3)
   (c-file-style . "k&r")
   (fill-column . 78)
   (c-file-offsets
diff --git a/src/gallium/drivers/freedreno/.editorconfig b/src/gallium/drivers/freedreno/.editorconfig
index c32fa49acbb..8675fb4bed5 100644
--- a/src/gallium/drivers/freedreno/.editorconfig
+++ b/src/gallium/drivers/freedreno/.editorconfig
@@ -1,5 +1,5 @@
 [*.{c,h}]
-indent_style = tab
-indent_size = 4
-tab_width = 4
+indent_style = space
+indent_size = 3
+tab_width = 3
 max_line_length = 78