Mesa (main): asahi: Fix meson dependency on packing in compiler

[GitLab Mirror]

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

Author: Alyssa Rosenzweig <alyssa at rosenzweig.io>
Date:   Tue Jul  6 09:41:15 2021 -0400

asahi: Fix meson dependency on packing in compiler

Closes: #5030
Signed-off-by: Alyssa Rosenzweig <alyssa at rosenzweig.io>
Fixes: 6a657b17b9b ("agx: Remap fragment shader varyings explicitly")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11730>

---

 src/asahi/compiler/meson.build | 2 +-
 src/asahi/meson.build          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/asahi/compiler/meson.build b/src/asahi/compiler/meson.build
index bce79d7048d..3a8f2729b30 100644
--- a/src/asahi/compiler/meson.build
+++ b/src/asahi/compiler/meson.build
@@ -71,7 +71,7 @@ libasahi_compiler = static_library(
   'asahi_compiler',
   [libasahi_agx_files, agx_opcodes_c],
   include_directories : [inc_include, inc_src, inc_mesa, inc_gallium, inc_gallium_aux, inc_mapi],
-  dependencies: [idep_nir, idep_agx_opcodes_h, idep_agx_builder_h],
+  dependencies: [idep_nir, idep_agx_opcodes_h, idep_agx_builder_h, idep_agx_pack],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
   build_by_default : false,
diff --git a/src/asahi/meson.build b/src/asahi/meson.build
index 1bb94d525fd..f272e926c1c 100644
--- a/src/asahi/meson.build
+++ b/src/asahi/meson.build
@@ -23,8 +23,8 @@ inc_asahi = include_directories([
    '.', 'lib', 'compiler'
 ])
 
-subdir('compiler')
 subdir('lib')
+subdir('compiler')
 
 files_agx = files(
   'compiler/cmdline.c',