Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com>
---
meson.build | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/meson.build b/meson.build
index 5a957ad13d1b39b5f709..04e2fdd19d7274aa5ecf 100644
--- a/meson.build
+++ b/meson.build
@@ -535,26 +535,21 @@ if va_drivers_path == ''
endif
_xa = get_option('gallium-xa')
-if _xa == 'auto'
- if not ['linux', 'bsd'].contains(host_machine.system())
- with_gallium_xa = false
- elif not (with_gallium_nouveau or with_gallium_freedreno or with_gallium_i915
- or with_gallium_svga)
- with_gallium_xa = false
- else
- with_gallium_xa = true
- endif
-elif _xa == 'true'
- if not ['linux', 'bsd'].contains(host_machine.system())
+if not ['linux', 'bsd'].contains(host_machine.system())
+ if _xa == 'true'
error('XA state tracker can only be built on unix-like OSes.')
- elif not (with_gallium_nouveau or with_gallium_freedreno or with_gallium_i915
- or with_gallium_svga)
+ else
+ _xa = 'false'
+ endif
+elif not (with_gallium_nouveau or with_gallium_freedreno or with_gallium_i915
+ or with_gallium_svga)
+ if _xa == 'true'
error('XA state tracker requires at least one of the following gallium
drivers: nouveau, freedreno, i915, svga.')
+ else
+ _xa = 'false'
endif
- with_gallium_xa = true
-else
- with_gallium_xa = false
endif
+with_gallium_xa = _xa != 'false'
d3d_drivers_path = get_option('d3d-drivers-path')
if d3d_drivers_path == ''
--
Cheers,
Eric
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
