diff options
| author | Dylan Baker <dylan.c.baker@intel.com> | 2022-12-20 15:09:41 -0800 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-01-19 16:29:03 +0000 |
| commit | 98bd7cdb8c47fc9e10ff85820f95302d1c1b1b51 (patch) | |
| tree | 18437be893ee3967bec5733f3863da1b22f2cd91 /meson.build | |
| parent | b200d547dcd21df11a1c3dbbf446700863532a27 (diff) | |
| download | mesa-98bd7cdb8c47fc9e10ff85820f95302d1c1b1b51.tar.gz | |
meson: use a feature option for shader_cache
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20409>
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/meson.build b/meson.build index 4d631ab1b8d..cf7b271c1e2 100644 --- a/meson.build +++ b/meson.build @@ -971,30 +971,16 @@ if get_option('buildtype') == 'debug' pre_args += '-DDEBUG' endif -with_shader_cache = false -_shader_cache = get_option('shader-cache') -if _shader_cache == 'true' - _shader_cache = 'enabled' - warning('shader_cache option "true" deprecated, please use "enabled" instead.') -elif _shader_cache == 'false' - _shader_cache = 'disabled' - warning('shader_cache option "false" deprecated, please use "disabled" instead.') -endif -if _shader_cache != 'disabled' - if host_machine.system() == 'windows' - if _shader_cache == 'enabled' - error('Shader Cache does not currently work on Windows') - endif - else - pre_args += '-DENABLE_SHADER_CACHE' - if not get_option('shader-cache-default') - pre_args += '-DSHADER_CACHE_DISABLE_BY_DEFAULT' - endif - with_shader_cache = true - endif -endif +with_shader_cache = get_option('shader-cache') \ + .require(host_machine.system() != 'windows', error_message : 'Shader Cache does not currently work on Windows') \ + .allowed() if with_shader_cache + pre_args += '-DENABLE_SHADER_CACHE' + if not get_option('shader-cache-default') + pre_args += '-DSHADER_CACHE_DISABLE_BY_DEFAULT' + endif + shader_cache_max_size = get_option('shader-cache-max-size') if shader_cache_max_size != '' pre_args += '-DMESA_SHADER_CACHE_MAX_SIZE="@0@"'.format(shader_cache_max_size) |