Mesa (main): panfrost: s/[idep_]midgard_pack/[idep_]pan_packers/

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 13c13efcac512e39a70f49a9c051e177253758fd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=13c13efcac512e39a70f49a9c051e177253758fd

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Wed Aug  4 10:41:54 2021 +0200

panfrost: s/[idep_]midgard_pack/[idep_]pan_packers/

We will soon have per-gen pack headers. Let's rename the meson variables
to reflect that.

Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12551>

---

 src/gallium/drivers/panfrost/meson.build |  6 +++---
 src/panfrost/lib/meson.build             | 16 ++++++++--------
 src/panfrost/vulkan/meson.build          |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build
index 221bf236962..171a20c8b2c 100644
--- a/src/gallium/drivers/panfrost/meson.build
+++ b/src/gallium/drivers/panfrost/meson.build
@@ -56,11 +56,11 @@ libpanfrost_versions = []
 foreach ver : panfrost_versions
   libpanfrost_versions += static_library(
     'panfrost-v' + ver,
-    ['pan_cmdstream.c', midgard_pack],
+    ['pan_cmdstream.c', pan_packers],
     include_directories : panfrost_includes,
     c_args : ['-DPAN_ARCH=' + ver],
     gnu_symbol_visibility : 'hidden',
-    dependencies : [idep_midgard_pack, idep_nir, dep_libdrm],
+    dependencies : [idep_pan_packers, idep_nir, dep_libdrm],
 )
 endforeach
 
@@ -72,7 +72,7 @@ libpanfrost = static_library(
     dep_libdrm,
     idep_mesautil,
     idep_nir,
-    idep_midgard_pack
+    idep_pan_packers
   ],
   include_directories : panfrost_includes,
   c_args : [c_msvc_compat_args, compile_args_panfrost],
diff --git a/src/panfrost/lib/meson.build b/src/panfrost/lib/meson.build
index 2a8067266f9..d669d2b3f26 100644
--- a/src/panfrost/lib/meson.build
+++ b/src/panfrost/lib/meson.build
@@ -19,7 +19,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-midgard_pack = custom_target(
+pan_packers = custom_target(
   'midgard_pack.h',
   input : ['gen_pack.py', 'midgard.xml'],
   output : 'midgard_pack.h',
@@ -27,8 +27,8 @@ midgard_pack = custom_target(
   capture : true,
 )
 
-idep_midgard_pack = declare_dependency(
-  sources : [midgard_pack],
+idep_pan_packers = declare_dependency(
+  sources : [pan_packers],
   include_directories : include_directories('.'),
 )
 
@@ -38,13 +38,13 @@ libpanfrost_pixel_format = []
 foreach ver : pixel_format_versions
   libpanfrost_pixel_format += static_library(
     'pan-format-v' + ver,
-    ['pan_format.c', midgard_pack],
+    ['pan_format.c', pan_packers],
     include_directories : [
       inc_src, inc_include, inc_gallium, inc_mesa, inc_panfrost_hw, inc_gallium_aux, inc_panfrost_hw
     ],
     c_args : ['-DPAN_ARCH=' + ver],
     gnu_symbol_visibility : 'hidden',
-    dependencies : [idep_midgard_pack, dep_libdrm],
+    dependencies : [idep_pan_packers, dep_libdrm],
 )
 endforeach
 
@@ -77,7 +77,7 @@ libpanfrost_decode_files = files(
 
 libpanfrost_lib = static_library(
   'panfrost_lib',
-  [libpanfrost_lib_files, midgard_pack],
+  [libpanfrost_lib_files, pan_packers],
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
@@ -88,7 +88,7 @@ libpanfrost_lib = static_library(
 
 libpanfrost_decode = static_library(
   'panfrost_decode',
-  [libpanfrost_decode_files, midgard_pack],
+  [libpanfrost_decode_files, pan_packers],
   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost],
   dependencies : idep_mesautil,
   c_args : [no_override_init_args],
@@ -99,7 +99,7 @@ libpanfrost_decode = static_library(
 libpanfrost_dep = declare_dependency(
   link_with: [libpanfrost_lib, libpanfrost_decode, libpanfrost_midgard, libpanfrost_bifrost, libpanfrost_pixel_format],
   include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_panfrost_hw, inc_panfrost],
-  dependencies: [dep_libdrm, idep_nir, idep_midgard_pack],
+  dependencies: [dep_libdrm, idep_nir, idep_pan_packers],
 )
 
 if with_tests
diff --git a/src/panfrost/vulkan/meson.build b/src/panfrost/vulkan/meson.build
index a5f14424498..773fb48d933 100644
--- a/src/panfrost/vulkan/meson.build
+++ b/src/panfrost/vulkan/meson.build
@@ -97,7 +97,7 @@ libvulkan_panfrost = shared_library(
     dep_thread,
     dep_valgrind,
     idep_nir,
-    idep_midgard_pack,
+    idep_pan_packers,
     panvk_deps,
     idep_vulkan_util,
     idep_mesautil,