Module: Mesa Branch: staging/19.1 Commit: e9a284e8d0dc3287b24522f070e75eda437a584d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e9a284e8d0dc3287b24522f070e75eda437a584d
Author: Dylan Baker <[email protected]> Date: Mon Jul 1 10:04:03 2019 -0700 meson: allow building all glx without any drivers Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111016 Fixes: a47c525f3281a2753180e076c7e9b7772aff8f06 ("meson: build glx") Acked-by: Emil Velikov <[email protected]> Reviewed-by: Eric Anholt <[email protected]> (cherry picked from commit 7cf50af6f512024331d766832e0cc20a6a4499d7) --- meson.build | 6 ++---- src/glx/meson.build | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index f5d28616005..7bc199b293e 100644 --- a/meson.build +++ b/meson.build @@ -312,7 +312,7 @@ if with_glx == 'dri' endif endif -if not (with_dri or with_gallium or with_glx == 'xlib' or with_glx == 'gallium-xlib') +if not (with_dri or with_gallium or with_glx != 'disabled') with_gles1 = false with_gles2 = false with_opengl = false @@ -379,9 +379,7 @@ if with_glx != 'disabled' error('xlib conflicts with any dri driver') endif elif with_glx == 'dri' - if not with_dri - error('dri based GLX requires at least one DRI driver') - elif not with_shared_glapi + if not with_shared_glapi error('dri based GLX requires shared-glapi') endif endif diff --git a/src/glx/meson.build b/src/glx/meson.build index 0e3245a254f..d7b4d086642 100644 --- a/src/glx/meson.build +++ b/src/glx/meson.build @@ -1,4 +1,4 @@ -# Copyright © 2017 Intel Corporation +# Copyright © 2017-2019 Intel Corporation # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -70,7 +70,7 @@ extra_libs_libglx = [] extra_deps_libgl = [] extra_ld_args_libgl = [] -if with_dri +if with_glx == 'dri' files_libglx += files( 'dri_common.c', 'dri_common.h', @@ -83,7 +83,7 @@ if with_dri endif # dri2 -if with_dri and with_dri_platform == 'drm' and dep_libdrm.found() +if with_glx == 'dri' and with_dri_platform == 'drm' and dep_libdrm.found() files_libglx += files( 'dri2.c', 'dri2_glx.c', _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
