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:
parent
a92f597b98
commit
7ca4a478ad
|
@ -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
|
||||
|
|
|
@ -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',
|
||||
|
|
Loading…
Reference in New Issue