Module: Mesa
Branch: master
Commit: 2d3004ef1caafc44d0e7adeaf1fe2bf0dfa1eced
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=2d3004ef1caafc44d0e7adeaf1fe2bf0dfa1eced
Author: Dylan Baker <dy...@pnwbakers.com>
Date: Tue Mar 6 11:32:23 2018 -0800
meson: combine state trackers and target if blocks
This is needed later since tizonia requires dri
Signed-off-by: Dylan Baker <dylan.c.ba...@intel.com>
Reviewed-by: Jon Turney <jon.tur...@dronecode.org.uk>
Reviewed-by: Eric Engestrom <eric.engest...@imgtec.com>
Tested-by: Julien Isorce <julien.iso...@gmail.com>
Tested-by: Karol Herbst <kher...@redhat.com>
---
src/gallium/meson.build | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/src/gallium/meson.build b/src/gallium/meson.build
index 7f49c28599..d3cbb76d94 100644
--- a/src/gallium/meson.build
+++ b/src/gallium/meson.build
@@ -138,27 +138,6 @@ 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')
-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')
-endif
-if with_platform_haiku
- subdir('state_trackers/hgl')
-endif
if with_gallium_opencl
# TODO: this isn't really clover specific, but ATM clover is the only
# consumer
@@ -184,24 +163,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('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
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
