X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fmeson.build;h=c9bfc0b729819fe809d0ebb521d32adf1e053263;hb=1755f608f5201e0a23f00cc3ea1b01edd07eb6ef;hp=2baca8a97ca3cfe36ff11b8391647b633c1c247f;hpb=f0337f0f701fc904d7c32556b8621438b2a45b3f;p=mesa.git

diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 2baca8a97ca..c9bfc0b7298 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -29,9 +29,28 @@ subdir('drivers/noop')
 subdir('drivers/trace')
 subdir('drivers/rbug')
 subdir('winsys/sw/null')
-subdir('winsys/sw/dri')
-subdir('winsys/sw/kms-dri')
+if with_dri
+  subdir('winsys/sw/dri')
+else
+  libswdri = []
+endif
+if with_gallium_drisw_kms
+  subdir('winsys/sw/kms-dri')
+else
+  libswkmsdri = []
+endif
 subdir('winsys/sw/wrapper')
+if with_platform_haiku
+  subdir('winsys/sw/hgl')
+endif
+if with_gallium_swr
+  if meson.version().version_compare('< 0.44.0')
+    error('SWR requires meson 0.44.0 or greater.')
+  endif
+  subdir('drivers/swr')
+else
+  driver_swr = declare_dependency()
+endif
 if with_gallium_softpipe
   subdir('drivers/softpipe')
   if with_llvm
@@ -100,6 +119,12 @@ if with_gallium_imx
 else
   driver_imx = declare_dependency()
 endif
+if with_gallium_tegra
+  subdir('winsys/tegra/drm')
+  subdir('drivers/tegra')
+else
+  driver_tegra = declare_dependency()
+endif
 if with_gallium_i915
   subdir('winsys/i915/drm')
   subdir('drivers/i915')
@@ -119,26 +144,17 @@ if with_gallium_virgl
 else
   driver_virgl = declare_dependency()
 endif
-if with_gallium_vdpau
-  subdir('state_trackers/vdpau')
-endif
-if with_gallium_xvmc
-  subdir('state_trackers/xvmc')
-endif
-if with_gallium_omx
-  subdir('state_trackers/omx_bellagio')
-endif
-if with_gallium_va
-  subdir('state_trackers/va')
-endif
-if with_gallium_xa
-  subdir('state_trackers/xa')
-endif
-if with_gallium_st_nine
-  subdir('state_trackers/nine')
+if with_gallium_opencl
+  # TODO: this isn't really clover specific, but ATM clover is the only
+  # consumer
+  subdir('targets/pipe-loader')
+
+  if meson.version().version_compare('< 0.44.0')
+    error('OpenCL requires meson 0.44.0 or greater.')
+  endif
+  subdir('state_trackers/clover')
+  subdir('targets/opencl')
 endif
-# TODO: SWR
-# TODO: clover
 if with_dri
   subdir('state_trackers/dri')
   subdir('targets/dri')
@@ -153,21 +169,31 @@ if with_glx == 'gallium-xlib'
   subdir('targets/libgl-xlib')
 endif
 if with_gallium_vdpau
+  subdir('state_trackers/vdpau')
   subdir('targets/vdpau')
 endif
 if with_gallium_xvmc
+  subdir('state_trackers/xvmc')
   subdir('targets/xvmc')
 endif
-if with_gallium_omx
-  subdir('targets/omx-bellagio')
+if with_gallium_omx != 'disabled'
+  subdir('state_trackers/omx')
+  subdir('targets/omx')
 endif
 if with_gallium_va
+  subdir('state_trackers/va')
   subdir('targets/va')
 endif
 if with_gallium_xa
+  subdir('state_trackers/xa')
   subdir('targets/xa')
 endif
+if with_platform_haiku
+  subdir('state_trackers/hgl')
+  subdir('targets/haiku-softpipe')
+endif
 if with_gallium_st_nine
+  subdir('state_trackers/nine')
   subdir('targets/d3dadapter9')
 endif
 # TODO: tests