meson: build radeonsi with aco

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22573>

diff --git a/src/amd/meson.build b/src/amd/meson.build
index f394f38..f1e3781 100644 (file)
--- a/src/amd/meson.build
+++ b/src/amd/meson.build
@@ -28,9 +28,10 @@ if with_amd_vk or with_gallium_radeonsi
   else
     libamd_common_llvm = []
   endif
+  subdir('compiler')
 endif
+
 if with_amd_vk
-  subdir('compiler')
   subdir('vulkan')
   if with_aco_tests
     subdir('compiler/tests')

diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build
index 806d863..e7da90d 100644 (file)
--- a/src/gallium/drivers/radeonsi/meson.build
+++ b/src/gallium/drivers/radeonsi/meson.build
@@ -105,7 +105,7 @@ files_libradeonsi = files(
 
 radeonsi_include_dirs = [inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common,
                          inc_amd_common_llvm, inc_gallium_drivers]
-radeonsi_deps = [dep_llvm, dep_clock, dep_libdrm_radeon, idep_nir_headers, idep_amdgfxregs_h, idep_mesautil]
+radeonsi_deps = [dep_llvm, dep_clock, dep_libdrm_radeon, idep_nir_headers, idep_amdgfxregs_h, idep_mesautil, idep_aco]
 
 radeonsi_gfx_libs = []
 foreach ver : ['6', '7', '8', '9', '10', '103', '11']