From 7a90886921eb1d5d73b40aadd6fd3f340041bd26 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 4 Dec 2018 10:06:08 -0800 Subject: meson: Add toggle for glx-direct GNU Hurd needs to turn off glx-direct, rather than special case it, we'll just add a toggle. CC: 18.3 Reviewed-by: Eric Engestrom --- meson.build | 4 +--- meson_options.txt | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 8eb5c092454..57dd8b59cb4 100644 --- a/meson.build +++ b/meson.build @@ -51,6 +51,7 @@ with_valgrind = get_option('valgrind') with_libunwind = get_option('libunwind') with_asm = get_option('asm') with_glx_read_only_text = get_option('glx-read-only-text') +with_glx_direct = get_option('glx-direct') with_osmesa = get_option('osmesa') with_swr_arches = get_option('swr-arches') with_tools = get_option('tools') @@ -365,9 +366,6 @@ if with_glvnd endif endif -# TODO: toggle for this -with_glx_direct = true - if with_vulkan_icd_dir == '' with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d') endif diff --git a/meson_options.txt b/meson_options.txt index a1d5ab0e185..589d10bb3f3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -318,3 +318,9 @@ option( choices : ['auto', 'true', 'false'], description : 'Enable VK_EXT_acquire_xlib_display.' ) +option( + 'glx-direct', + type : 'boolean', + value : true, + description : 'Enable direct rendering in GLX and EGL for DRI', +) -- cgit v1.2.3