From 7ca4a478ad307e3e706e86b2786929a6a3b7dff8 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 19 Nov 2020 16:09:22 -0800 Subject: [PATCH] meson: Don't add extra values to shader-cache We're trying to move to using a feature here, adding more values breaks that. Fixes: 5de56937a3d009659076dc67de6a57379fc7a31b ("disk_cache: build option for disabled-by-default") Reviewed-by: Eric Engestrom Part-of: --- meson.build | 6 +++--- meson_options.txt | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index a1692bfb0b3ce..9caf6fadf7408 100644 --- a/meson.build +++ b/meson.build @@ -932,12 +932,12 @@ elif _shader_cache == 'false' endif if _shader_cache != 'disabled' if host_machine.system() == 'windows' - if ['enabled', 'default-disabled'].contains(_shader_cache) + if _shader_cache == 'enabled' error('Shader Cache does not currently work on Windows') endif else pre_args += '-DENABLE_SHADER_CACHE' - if _shader_cache == 'default-disabled' + if not get_option('shader-cache-default') pre_args += '-DSHADER_CACHE_DISABLE_BY_DEFAULT' endif with_shader_cache = true @@ -1816,7 +1816,7 @@ if with_platform_x11 endif endif endif - if (with_egl or + if (with_egl or with_dri3 or ( with_gallium_vdpau or with_gallium_xvmc or with_gallium_xa or with_gallium_omx != 'disabled')) diff --git a/meson_options.txt b/meson_options.txt index 1847928cea23e..bae9aa82c2d25 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -185,8 +185,14 @@ option( 'shader-cache', type : 'combo', value : 'auto', - choices : ['auto', 'true', 'false', 'enabled', 'disabled', 'default-disabled'], - description : 'Build with on-disk shader cache support. If set to default-disabled, the feature is only activated when environment variable MESA_GLSL_CACHE_DISABLE is set to false' + choices : ['auto', 'true', 'false', 'enabled', 'disabled'], + description : 'Build with on-disk shader cache support.', +) +option( + 'shader-cache-default', + type : 'boolean', + value : true, + description : 'If set to false, the feature is only activated when environment variable MESA_GLSL_CACHE_DISABLE is set to false', ) option( 'vulkan-icd-dir',