meson: don't use build_by_default for specific gallium drivers

Using build_by_default : false is convenient for dependencies that can
be pulled in by various diverse components of the build system, the
gallium hardware/software drivers and state trackers do not fit that
description. Instead, these should be guarded using the variable that tracks
whether that driver should be enabled.

This leaves a few helper libraries: trace, rbug, etc, and the generic
winsys bits as `build_by_default : false` because there are a large
number of gallium components that pull them in.

v2: - remove build_by_default from winsys convenience libs as well.
v3: - Always put drivers before winsys for consistency

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Tested-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> (v1)
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build
index fe1a902e9e527e7fd0915db29511872b48e47c7e..d2b901334d066b8b3a054349ea74f0817fe25065 100644 (file)
--- a/src/gallium/drivers/freedreno/meson.build
+++ b/src/gallium/drivers/freedreno/meson.build
@@ -207,7 +207,6 @@ libfreedreno = static_library(
   c_args : [c_vis_args],
   cpp_args : [cpp_vis_args],
   dependencies : [dep_libdrm, dep_libdrm_freedreno],
-  build_by_default : false,
 )
 
 ir3_compiler = executable(

diff --git a/src/gallium/drivers/llvmpipe/meson.build b/src/gallium/drivers/llvmpipe/meson.build
index ca1d2aa797be0adb3ae494972adc66c97c4f1f43..9d0edb0ac33bd47a6053514d4718fb8cf9bfbc58 100644 (file)
--- a/src/gallium/drivers/llvmpipe/meson.build
+++ b/src/gallium/drivers/llvmpipe/meson.build
@@ -98,7 +98,6 @@ libllvmpipe = static_library(
   cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
   include_directories : [inc_gallium, inc_gallium_aux, inc_include, inc_src],
   dependencies : dep_llvm,
-  build_by_default : false,
 )
 
 if with_tests and with_gallium_softpipe and with_llvm

diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build
index 2bc6142879e4de60b020837dfb4ca1f2a96d805f..59fecfc52550cffbe1849e7c86b645e24da4464d 100644 (file)
--- a/src/gallium/drivers/nouveau/meson.build
+++ b/src/gallium/drivers/nouveau/meson.build
@@ -211,7 +211,6 @@ libnouveau = static_library(
   c_args : [c_vis_args],
   cpp_args : [cpp_vis_args],
   dependencies : [dep_libdrm, dep_libdrm_nouveau],
-  build_by_default : false,
 )
 
 nouveau_compiler = executable(

diff --git a/src/gallium/drivers/radeon/meson.build b/src/gallium/drivers/radeon/meson.build
index b4d2832d016fc078bcdf66b6fe1578bf7b51d1a7..f378b12e8e8509fa66d86e530bead86ef51d2cd0 100644 (file)
--- a/src/gallium/drivers/radeon/meson.build
+++ b/src/gallium/drivers/radeon/meson.build
@@ -51,5 +51,4 @@ libradeon = static_library(
   include_directories : [
     inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
   ],
-  build_by_default : false,
 )

diff --git a/src/gallium/drivers/radeonsi/meson.build b/src/gallium/drivers/radeonsi/meson.build
index 4392184dbb63b8102f4bb4d3cb5b63a3084eb5c0..974004db67f8d935d5e5fe6a67155f320b782e50 100644 (file)
--- a/src/gallium/drivers/radeonsi/meson.build
+++ b/src/gallium/drivers/radeonsi/meson.build
@@ -75,5 +75,4 @@ libradeonsi = static_library(
   c_args : [c_vis_args],
   cpp_args : [cpp_vis_args],
   dependencies : dep_llvm,
-  build_by_default : false,
 )

diff --git a/src/gallium/drivers/softpipe/meson.build b/src/gallium/drivers/softpipe/meson.build
index 0cef15152e21d619bb51854d8311b3f084d93e93..df23533c72cbac5b45ee3cf35f3b1b32bb1d08e5 100644 (file)
--- a/src/gallium/drivers/softpipe/meson.build
+++ b/src/gallium/drivers/softpipe/meson.build
@@ -81,5 +81,4 @@ libsoftpipe = static_library(
   files_softpipe,
   include_directories : [inc_gallium_aux, inc_gallium, inc_include, inc_src],
   c_args : [c_vis_args, c_msvc_compat_args],
-  build_by_default : false,
 )

diff --git a/src/gallium/drivers/vc5/meson.build b/src/gallium/drivers/vc5/meson.build
index d066366fcc74ea38d58c96d8abc55c7e6513dbbb..61059a15560a0ebea25907849f32362a4c17ca9c 100644 (file)
--- a/src/gallium/drivers/vc5/meson.build
+++ b/src/gallium/drivers/vc5/meson.build
@@ -61,5 +61,4 @@ libvc5 = static_library(
   c_args : [c_vis_args, v3dv3_c_args],
   cpp_args : [cpp_vis_args],
   dependencies : [dep_v3dv3, dep_libdrm, dep_valgrind],
-  build_by_default : false,
 )

diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index c5772b36cb60224dd1ebb2df1c87a271b82de4ab..7ccf4819079968f806fe5263d6105a3a4f655bac 100644 (file)
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -27,41 +27,44 @@ subdir('drivers/ddebug')
 subdir('drivers/noop')
 subdir('drivers/trace')
 subdir('drivers/rbug')
-subdir('drivers/radeon')
-subdir('drivers/radeonsi')
-subdir('drivers/nouveau')
-if with_gallium_freedreno
-  subdir('drivers/freedreno')
-endif
-subdir('drivers/softpipe')
-if with_gallium_vc4
-  subdir('drivers/vc4')
-endif
-if with_gallium_vc5
-  subdir('drivers/vc5')
-endif
-if with_gallium_etnaviv
-  subdir('drivers/etnaviv')
-endif
-subdir('drivers/llvmpipe')
 subdir('winsys/sw/null')
 subdir('winsys/sw/dri')
 subdir('winsys/sw/kms-dri')
 subdir('winsys/sw/wrapper')
-if with_gallium_vc4
+if with_gallium_softpipe
+  subdir('drivers/softpipe')
+  if with_llvm
+    subdir('drivers/llvmpipe')
+  endif
+endif
+if with_gallium_radeonsi
+  # TODO: some of these are needed by r300 and r600
+  subdir('drivers/radeon')
+  subdir('drivers/radeonsi')
+  subdir('winsys/radeon/drm')
+  subdir('winsys/amdgpu/drm')
+endif
+if with_gallium_nouveau
+  subdir('drivers/nouveau')
+  subdir('winsys/nouveau/drm')
+endif
+if with_gallium_freedreno
+  subdir('drivers/freedreno')
+  subdir('winsys/freedreno/drm')
+endif
+if with_gallium_pl111
   subdir('winsys/pl111/drm')
 endif
-subdir('winsys/radeon/drm')
-subdir('winsys/amdgpu/drm')
-subdir('winsys/nouveau/drm')
-subdir('winsys/freedreno/drm')
 if with_gallium_vc4
+  subdir('drivers/vc4')
   subdir('winsys/vc4/drm')
 endif
 if with_gallium_vc5
+  subdir('drivers/vc5')
   subdir('winsys/vc5/drm')
 endif
 if with_gallium_etnaviv
+  subdir('drivers/etnaviv')
   subdir('winsys/etnaviv/drm')
 endif
 if with_gallium_imx

diff --git a/src/gallium/state_trackers/dri/meson.build b/src/gallium/state_trackers/dri/meson.build
index 5d89f23a6fef741110e939f13072361619bca8b7..b99314ebf614d43990b894d6212ef2e5829b9804 100644 (file)
--- a/src/gallium/state_trackers/dri/meson.build
+++ b/src/gallium/state_trackers/dri/meson.build
@@ -53,5 +53,4 @@ libdri = static_library(
   ],
   c_args : [c_vis_args, libdri_c_args],
   dependencies : dep_libdrm,
-  build_by_default : false,
 )

diff --git a/src/gallium/winsys/amdgpu/drm/meson.build b/src/gallium/winsys/amdgpu/drm/meson.build
index a81750e842a3f4da0ce7b58541988a6e6d3c6596..8b6f69b2bdd0c42be592cbfaf6b6222c85f27b36 100644 (file)
--- a/src/gallium/winsys/amdgpu/drm/meson.build
+++ b/src/gallium/winsys/amdgpu/drm/meson.build
@@ -32,5 +32,4 @@ libamdgpuwinsys = static_library(
   cpp_args : [cpp_vis_args],
   link_with : libamdgpu_addrlib,
   dependencies : dep_libdrm_amdgpu,
-  build_by_default : false,
 )

diff --git a/src/gallium/winsys/freedreno/drm/meson.build b/src/gallium/winsys/freedreno/drm/meson.build
index 71ee01139d313fdcd6c3728aa302dc068de5c410..34aff635ddef86732893a2e741c7b0b94c6554fb 100644 (file)
--- a/src/gallium/winsys/freedreno/drm/meson.build
+++ b/src/gallium/winsys/freedreno/drm/meson.build
@@ -26,5 +26,4 @@ libfreedrenowinsys = static_library(
   ],
   c_args : [c_vis_args],
   dependencies : [dep_libdrm_freedreno],
-  build_by_default : false,
 )

diff --git a/src/gallium/winsys/nouveau/drm/meson.build b/src/gallium/winsys/nouveau/drm/meson.build
index b5ef0d7097f2b38a6c70e24ea89a61a6b7d83b25..cf661971f8b60e8d538d17160d484b29b3a83098 100644 (file)
--- a/src/gallium/winsys/nouveau/drm/meson.build
+++ b/src/gallium/winsys/nouveau/drm/meson.build
@@ -26,5 +26,4 @@ libnouveauwinsys = static_library(
   ],
   c_args : [c_vis_args],
   dependencies : [dep_libdrm_nouveau],
-  build_by_default : false,
 )

diff --git a/src/gallium/winsys/radeon/drm/meson.build b/src/gallium/winsys/radeon/drm/meson.build
index 8a3f802115708b91173312a331f0c7d6dc2eccd9..d123df0502b347fb27f9f25bfeba73393363c915 100644 (file)
--- a/src/gallium/winsys/radeon/drm/meson.build
+++ b/src/gallium/winsys/radeon/drm/meson.build
@@ -26,5 +26,4 @@ libradeonwinsys = static_library(
   include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux],
   c_args : [c_vis_args],
   dependencies : [dep_libdrm_radeon],
-  build_by_default : false,
 )