aco: use nir_move_copies

[mesa.git] / src / gallium / targets / dri / meson.build

diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index fb8bd97c416487a8e79d1583a670b884fea97ad3..954b2182ce446d1b98c571814204e0b06c76a28c 100644 (file)
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -39,14 +39,14 @@ endif
 
 libgallium_dri = shared_library(
   'gallium_dri',
-  [files('target.c'), xmlpool_options_h],
+  files('target.c'),
   include_directories : [
     inc_common, inc_util, inc_dri_common, inc_gallium_drivers,
     inc_gallium_winsys, include_directories('../../state_trackers/dri'),
   ],
   c_args : [c_vis_args],
   cpp_args : [cpp_vis_args],
-  link_args : [ld_args_gc_sections, gallium_dri_ld_args],
+  link_args : [ld_args_build_id, ld_args_gc_sections, gallium_dri_ld_args],
   link_depends : gallium_dri_link_depends,
   link_with : [
     libmesa_gallium, libdricommon, libmegadriver_stub, libdri, libgalliumvl,
@@ -54,29 +54,37 @@ libgallium_dri = shared_library(
     libswkmsdri,
   ],
   dependencies : [
-    dep_selinux, dep_expat, dep_libdrm, dep_llvm, dep_thread,
+    dep_selinux, dep_libdrm, dep_llvm, dep_thread, idep_xmlconfig,
     driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
     driver_kmsro, driver_v3d, driver_vc4, driver_freedreno, driver_etnaviv,
     driver_tegra, driver_i915, driver_svga, driver_virgl,
-    driver_swr, driver_panfrost, driver_iris, driver_lima
+    driver_swr, driver_panfrost, driver_iris, driver_lima, driver_zink
   ],
   # Will be deleted during installation, see install_megadrivers.py
   install : true,
   install_dir : dri_drivers_path,
+  name_suffix : 'so',
 )
 
 foreach d : [[with_gallium_kmsro, [
+               'armada-drm_dri.so',
+               'exynos_dri.so',
                'hx8357d_dri.so',
                'ili9225_dri.so',
                'ili9341_dri.so',
                'imx-drm_dri.so',
+               'ingenic-drm_dri.so',
+               'mcde_dri.so',
                'meson_dri.so',
                'mi0283qt_dri.so',
+               'mxsfb-drm_dri.so',
                'pl111_dri.so',
                'repaper_dri.so',
                'rockchip_dri.so',
-               'st7586.so',
-               'st7735r.so',
+               'st7586_dri.so',
+               'st7735r_dri.so',
+               'stm_dri.so',
+              'sun4i-drm_dri.so',
              ]],
              [with_gallium_radeonsi, 'radeonsi_dri.so'],
              [with_gallium_nouveau, 'nouveau_dri.so'],
@@ -94,15 +102,15 @@ foreach d : [[with_gallium_kmsro, [
              [with_gallium_r600, 'r600_dri.so'],
              [with_gallium_svga, 'vmwgfx_dri.so'],
              [with_gallium_virgl, 'virtio_gpu_dri.so'],
-             [with_gallium_lima, 'lima_dri.so']]
+             [with_gallium_lima, 'lima_dri.so'],
+             [with_gallium_zink, 'zink_dri.so']]
   if d[0]
     gallium_dri_drivers += d[1]
   endif
 endforeach
 
 meson.add_install_script(
-  prog_python.path(),
-  join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
+  install_megadrivers_py.path(),
   libgallium_dri.full_path(),
   dri_drivers_path,
   gallium_dri_drivers,