meson: move gl pkgconfig generation out of glx

[mesa.git] / src / gallium / meson.build

diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 3c5756c0a7f923d7a4236490bd4427cea43f13eb..6edfe80321d3a4da9d89edff64cc1104586a4827 100644 (file)
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -18,7 +18,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-inc_gallium = include_directories('include')
 inc_gallium_drivers = include_directories('drivers')
 inc_gallium_winsys = include_directories('winsys')
 
@@ -31,40 +30,61 @@ subdir('drivers/rbug')
 subdir('drivers/radeon')
 subdir('drivers/radeonsi')
 subdir('drivers/nouveau')
+subdir('drivers/freedreno')
 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
+  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('winsys/vc4/drm')
 endif
+if with_gallium_vc5
+  subdir('winsys/vc5/drm')
+endif
+if with_gallium_etnaviv
+  subdir('winsys/etnaviv/drm')
+endif
+if with_gallium_imx
+  subdir('winsys/imx/drm')
+endif
 subdir('state_trackers/dri')
-# TODO: freedreno
+if with_osmesa == 'gallium'
+  subdir('state_trackers/osmesa')
+endif
 # TODO: i915
 # TODO: SVGA
 # TODO: r300
 # TODO: r600
-# TODO: etnaviv
-# TODO: IMX
-# TODO: PL111
 # TODO: SWR
 # TODO: virgl
 # TODO: winsys/sw/xlib
 # TODO: clover
-if with_dri
+if with_dri and with_gallium
   subdir('targets/dri')
 endif
+if with_osmesa == 'gallium'
+  subdir('targets/osmesa')
+endif
 # TODO: xlib-glx
 # TODO: OMX
-# TODO: osmesa
 # TODO: VA
 # TODO: vdpau
 # TODO: xa