From 383cdaf990959c9e52b93ae81187eef2487ab694 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 28 Nov 2017 14:30:27 -0800 Subject: [PATCH] meson: Combine gallium target subdirs So that state trackers, targets, and special winsys requirements are all in a single if statement. This is a cosmetic only cleanup with no functional changes. Signed-off-by: Dylan Baker Reviewed-by: Eric Engestrom --- src/gallium/meson.build | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/gallium/meson.build b/src/gallium/meson.build index 8e60c7f3288..be830f5f7d6 100644 --- a/src/gallium/meson.build +++ b/src/gallium/meson.build @@ -91,25 +91,19 @@ if with_gallium_virgl subdir('winsys/virgl/drm') subdir('winsys/virgl/vtest') endif -if with_dri - subdir('state_trackers/dri') -endif -if with_osmesa == 'gallium' - subdir('state_trackers/osmesa') -endif -if with_glx == 'gallium-xlib' - subdir('winsys/sw/xlib') - subdir('state_trackers/glx/xlib') -endif # TODO: SWR # TODO: clover if with_dri + subdir('state_trackers/dri') subdir('targets/dri') endif if with_osmesa == 'gallium' + subdir('state_trackers/osmesa') subdir('targets/osmesa') endif if with_glx == 'gallium-xlib' + subdir('winsys/sw/xlib') + subdir('state_trackers/glx/xlib') subdir('targets/libgl-xlib') endif # TODO: OMX -- 2.30.2