KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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: 5de56937a3
       ("disk_cache: build option for disabled-by-default")

Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7699>
This commit is contained in:
Dylan Baker 2020-11-19 16:09:22 -08:00 committed by Marge Bot
parent a92f597b98
commit 7ca4a478ad
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -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'))

10
meson_options.txt
View File

@ -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',