[PATCH libdrm v2 09/23] meson: use simple option handling for intel

Eric Engestrom eric.engestrom at imgtec.com
Wed Apr 4 15:38:04 UTC 2018


Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.com>
---
 meson.build | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/meson.build b/meson.build
index 8efa99b54e6a108b8255..12cf96157b2789df3a55 100644
--- a/meson.build
+++ b/meson.build
@@ -70,6 +70,7 @@ config.set10('HAVE_LIBDRM_ATOMIC_PRIMITIVES', intel_atomics)
 config.set10('HAVE_LIB_ATOMIC_OPS', lib_atomics)
 
 foreach d : [
+  ['intel', true, host_machine.cpu_family().startswith('x86')],
 ]
   driver = d[0]
   require_atomics = d[1]
@@ -90,17 +91,6 @@ foreach d : [
   endif
 endforeach
 
-with_intel = false
-_intel = get_option('intel')
-if _intel == 'auto'
-  with_intel = with_atomics and host_machine.cpu_family().startswith('x86')
-else
-  with_intel = _intel == 'true'
-endif
-if with_intel and not with_atomics
-  error('libdrm_intel requires atomics.')
-endif
-
 with_radeon = false
 _radeon = get_option('radeon')
 if _radeon == 'auto'
-- 
Cheers,
  Eric



More information about the dri-devel mailing list