Module: Mesa Branch: master Commit: 28f18915b89ede1baac770b042943c6ebd0f5ef4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=28f18915b89ede1baac770b042943c6ebd0f5ef4
Author: Erik Faye-Lund <[email protected]> Date: Mon Apr 15 10:11:43 2019 +0200 meson: lift driver-collection out into parent build-file This way we can mark the dri_drivers and dri_link arrays as temporary, as all knowledge about them are contained in a single build-file with clearly visible limited life-span. Signed-off-by: Erik Faye-Lund <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> Acked-by: Dylan Baker <[email protected]> --- src/mesa/drivers/dri/i915/meson.build | 3 --- src/mesa/drivers/dri/i965/meson.build | 3 --- src/mesa/drivers/dri/meson.build | 22 +++++++++++++++++----- src/mesa/drivers/dri/nouveau/meson.build | 3 --- src/mesa/drivers/dri/r200/meson.build | 3 --- src/mesa/drivers/dri/radeon/meson.build | 3 --- src/mesa/drivers/dri/swrast/meson.build | 3 --- 7 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/mesa/drivers/dri/i915/meson.build b/src/mesa/drivers/dri/i915/meson.build index 1971419a6b7..9e62010f2a2 100644 --- a/src/mesa/drivers/dri/i915/meson.build +++ b/src/mesa/drivers/dri/i915/meson.build @@ -92,6 +92,3 @@ libi915 = static_library( cpp_args : [cpp_vis_args], dependencies : [dep_libdrm, dep_libdrm_intel], ) - -dri_drivers += libi915 -dri_link += 'i915_dri.so' diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build index 3c3637dbebc..04b477db58b 100644 --- a/src/mesa/drivers/dri/i965/meson.build +++ b/src/mesa/drivers/dri/i965/meson.build @@ -162,6 +162,3 @@ libi965 = static_library( ], dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers, idep_genxml], ) - -dri_drivers += libi965 -dri_link += 'i965_dri.so' diff --git a/src/mesa/drivers/dri/meson.build b/src/mesa/drivers/dri/meson.build index dddc4ae3dfd..38f56998d69 100644 --- a/src/mesa/drivers/dri/meson.build +++ b/src/mesa/drivers/dri/meson.build @@ -20,32 +20,44 @@ subdir('common') -dri_drivers = [] -dri_link = [] +_dri_drivers = [] +_dri_link = [] if with_dri_swrast subdir('swrast') + _dri_drivers += libswrast_dri + _dri_link += 'swrast_dri.so' endif if with_dri_i915 subdir('i915') + _dri_drivers += libi915 + _dri_link += 'i915_dri.so' endif if with_dri_i965 subdir('i965') + _dri_drivers += libi965 + _dri_link += 'i965_dri.so' endif if with_dri_r100 subdir('radeon') + _dri_drivers += libr100 + _dri_link += 'radeon_dri.so' endif if with_dri_r200 subdir('r200') + _dri_drivers += libr200 + _dri_link += 'r200_dri.so' endif if with_dri_nouveau subdir('nouveau') + _dri_drivers += libnouveau_vieux + _dri_link += 'nouveau_vieux_dri.so' endif -if dri_drivers != [] +if _dri_drivers != [] libmesa_dri_drivers = shared_library( 'mesa_dri_drivers', [], - link_whole : dri_drivers, + link_whole : _dri_drivers, link_with : [ libmegadriver_stub, libdricommon, libxmlconfig, libglapi, libmesa_util, libmesa_classic, @@ -65,7 +77,7 @@ if dri_drivers != [] join_paths(meson.source_root(), 'bin/install_megadrivers.py'), libmesa_dri_drivers.full_path(), dri_drivers_path, - dri_link, + _dri_link, ) endif diff --git a/src/mesa/drivers/dri/nouveau/meson.build b/src/mesa/drivers/dri/nouveau/meson.build index 9ad6779d85e..c07d2a2be13 100644 --- a/src/mesa/drivers/dri/nouveau/meson.build +++ b/src/mesa/drivers/dri/nouveau/meson.build @@ -87,6 +87,3 @@ libnouveau_vieux = static_library( cpp_args : [cpp_vis_args], dependencies : [dep_libdrm, dep_libdrm_nouveau], ) - -dri_drivers += libnouveau_vieux -dri_link += 'nouveau_vieux_dri.so' diff --git a/src/mesa/drivers/dri/r200/meson.build b/src/mesa/drivers/dri/r200/meson.build index 8389b4f6360..686054d162b 100644 --- a/src/mesa/drivers/dri/r200/meson.build +++ b/src/mesa/drivers/dri/r200/meson.build @@ -86,6 +86,3 @@ libr200 = static_library( cpp_args : [cpp_vis_args], dependencies : [dep_libdrm, dep_libdrm_radeon], ) - -dri_drivers += libr200 -dri_link += 'r200_dri.so' diff --git a/src/mesa/drivers/dri/radeon/meson.build b/src/mesa/drivers/dri/radeon/meson.build index bed608258a7..83b356550ec 100644 --- a/src/mesa/drivers/dri/radeon/meson.build +++ b/src/mesa/drivers/dri/radeon/meson.build @@ -82,6 +82,3 @@ libr100 = static_library( cpp_args : [cpp_vis_args], dependencies : [dep_libdrm, dep_libdrm_radeon], ) - -dri_drivers += libr100 -dri_link += 'radeon_dri.so' diff --git a/src/mesa/drivers/dri/swrast/meson.build b/src/mesa/drivers/dri/swrast/meson.build index 5ceb1e33e3e..35b30588ca7 100644 --- a/src/mesa/drivers/dri/swrast/meson.build +++ b/src/mesa/drivers/dri/swrast/meson.build @@ -25,6 +25,3 @@ libswrast_dri = static_library( include_directories : [inc_common, inc_dri_common], dependencies : dep_libdrm, ) - -dri_drivers += libswrast_dri -dri_link += 'swrast_dri.so' _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
