X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Ftargets%2Fdri%2Fmeson.build;h=2c80bf12090a977dfa53a466e1b2a292082ab8a2;hb=d6287a94b697ffe12a4e576a38943cdf4e90cdb0;hp=771a38d3214058d46e22b33d841824a537183c7a;hpb=813b4b09f9d0168357b165566d403186cfe83701;p=mesa.git

diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build
index 771a38d3214..2c80bf12090 100644
--- a/src/gallium/targets/dri/meson.build
+++ b/src/gallium/targets/dri/meson.build
@@ -1,4 +1,5 @@
 # Copyright © 2017 Dylan Baker
+# Copyright © 2018 Intel Corporation
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -22,18 +23,10 @@
 # Static targets are always enabled in autotools (unless you modify
 # configure.ac)
 
-gallium_dri_c_args = [
-  '-DGALLIUM_DDEBUG',
-  '-DGALLIUM_NOOP',
-  '-DGALLIUM_RBUG',
-  '-DGALLIUME_TRACE',
-]
+gallium_dri_c_args = []
 gallium_dri_ld_args = []
-gallium_dri_link_with = []
-gallium_dri_depends = []
 gallium_dri_link_depends = []
 gallium_dri_drivers = []
-gallium_dri_sources = []
 
 if with_ld_version_script
   gallium_dri_ld_args += ['-Wl,--version-script', join_paths(meson.current_source_dir(), 'dri.sym')]
@@ -44,50 +37,80 @@ if with_ld_dynamic_list
   gallium_dri_link_depends += files('../dri-vdpau.dyn')
 endif
 
-if with_dri
-  gallium_dri_link_with += libswdri
-endif
-if with_gallium_drisw_kms
-  gallium_dri_link_with += libswkmsdri
-endif
-
-if with_gallium_radeonsi
-  gallium_dri_c_args += '-DGALLIUM_RADEONSI'
-  gallium_dri_link_with += [
-    libradeonsi, libnir, libradeonwinsys, libamdgpuwinsys, libradeon,
-    libamd_common,
-  ]
-  gallium_dri_drivers += 'radeonsi_dri.so'
-endif
-if with_gallium_nouveau
-  gallium_dri_c_args += '-DGALLIUM_NOUVEAU'
-  gallium_dri_link_with += [libnouveauwinsys, libnouveau]
-  gallium_dri_drivers += 'nouveau_dri.so'
-endif
-
 libgallium_dri = shared_library(
   'gallium_dri',
-  [files('target.c'), gallium_dri_sources],
+  files('target.c'),
   include_directories : [
-    inc_common, inc_util, inc_dri_common, inc_gallium_drivers,
-    inc_gallium_winsys, include_directories('../../state_trackers/dri'),
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util, inc_dri_common, inc_gallium_drivers,
+    inc_gallium_winsys, include_directories('../../frontends/dri'),
   ],
-  c_args : [c_vis_args, gallium_dri_c_args],
+  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,
-    libgallium, libddebug, libnoop, librbug, libtrace, libglapi,
-    libpipe_loader_static, libws_null, libwsw,  gallium_dri_link_with,
+    libdri, libmesa_gallium, libdricommon, libmegadriver_stub, libgalliumvl,
+    libgallium, libglapi, libpipe_loader_static, libws_null, libwsw, libswdri,
+    libswkmsdri,
   ],
   dependencies : [
-    gallium_dri_depends, dep_selinux, dep_expat, dep_libdrm, dep_llvm,
+    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_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_dri.so',
+               'st7735r_dri.so',
+               'stm_dri.so',
+	       'sun4i-drm_dri.so',
+             ]],
+             [with_gallium_radeonsi, 'radeonsi_dri.so'],
+             [with_gallium_nouveau, 'nouveau_dri.so'],
+             [with_gallium_freedreno, ['msm_dri.so', 'kgsl_dri.so']],
+             [with_gallium_softpipe or with_gallium_swr, 'swrast_dri.so'],
+             [with_gallium_softpipe and with_gallium_drisw_kms, 'kms_swrast_dri.so'],
+             [with_gallium_v3d, 'v3d_dri.so'],
+             [with_gallium_vc4, 'vc4_dri.so'],
+             [with_gallium_panfrost, 'panfrost_dri.so'],
+             [with_gallium_etnaviv, 'etnaviv_dri.so'],
+             [with_gallium_tegra, 'tegra_dri.so'],
+             [with_gallium_iris, 'iris_dri.so'],
+             [with_gallium_i915, 'i915_dri.so'],
+             [with_gallium_r300, 'r300_dri.so'],
+             [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_zink, 'zink_dri.so']]
+  if d[0]
+    gallium_dri_drivers += d[1]
+  endif
+endforeach
+
 meson.add_install_script(
-  join_paths(meson.source_root(), 'bin/install_megadrivers.py'),
+  install_megadrivers_py.path(),
   libgallium_dri.full_path(),
   dri_drivers_path,
   gallium_dri_drivers,