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]>

1 files changed, 17 insertions, 5 deletions

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