meson: simplify the gbm option code, and avoid changing types
authorEric Engestrom <eric.engestrom@imgtec.com>
Fri, 23 Feb 2018 17:08:20 +0000 (17:08 +0000)
committerEric Engestrom <eric.engestrom@imgtec.com>
Tue, 27 Feb 2018 11:21:20 +0000 (11:21 +0000)
v2: drop gallium comment (Dylan)

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
meson.build

index 6f2615f9d17d0dc255b27e80e9fd05833b82565a..40e9c8ff45290d60eecd855ee08343fda80fdf4d 100644 (file)
@@ -294,16 +294,14 @@ if not (with_dri or with_gallium or with_glx == 'xlib' or with_glx == 'gallium-x
   with_shared_glapi = false
 endif
 
-with_gbm = get_option('gbm')
-if with_gbm == 'auto' and with_dri  # TODO: or gallium
-  with_gbm = system_has_kms_drm
-elif with_gbm == 'true'
-  if not system_has_kms_drm
-    error('GBM only supports DRM/KMS platforms')
-  endif
-  with_gbm = true
+_gbm = get_option('gbm')
+if _gbm == 'auto'
+  with_gbm = system_has_kms_drm and with_dri
 else
-  with_gbm = false
+  with_gbm = _gbm == 'true'
+endif
+if with_gbm and not system_has_kms_drm
+  error('GBM only supports DRM/KMS platforms')
 endif
 
 _egl = get_option('egl')