From 876db9135048be34d84bd74b18411678e15c7c3f Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 15 Feb 2024 12:08:20 -0800 Subject: [PATCH] meson: rework intel-rt option to be a feature This allows intel-rt to be turned on in cases where we're on x86_64 and we're building anv, but otherwise default to off, while still giving users the power to ignore those defaults if they want to. Because of the use of `feature.disable_if` this bumps the Meson requirement to 1.1. I can get rid of that, but it just makes for a lot more code than using the helper methods Part-of: --- meson.build | 8 +++++--- meson_options.txt | 6 +----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index c7c507dcca47f..f86f412f3645b 100644 --- a/meson.build +++ b/meson.build @@ -23,7 +23,7 @@ project( ['c', 'cpp'], version : files('VERSION'), license : 'MIT', - meson_version : '>= 0.60', + meson_version : '>= 1.1.0', default_options : [ 'buildtype=debugoptimized', 'b_ndebug=if-release', @@ -303,8 +303,10 @@ else with_intel_clc = false endif -with_intel_vk_rt = ['x86_64'].contains(host_machine.cpu_family()) and \ - with_intel_vk and get_option('intel-rt') != 'disabled' +with_intel_vk_rt = get_option('intel-rt') \ + .disable_auto_if(not with_intel_vk) \ + .disable_if(host_machine.cpu_family() != 'x86_64', error_message : 'Intel Ray Tracing is only supported on x86_64') \ + .allowed() with_any_intel = [ with_gallium_crocus, diff --git a/meson_options.txt b/meson_options.txt index 789ec68869225..3da8e6a3350bd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -651,12 +651,8 @@ option( option( 'intel-rt', - type : 'combo', + type : 'feature', deprecated: {'true': 'enabled', 'false': 'disabled'}, - value : 'disabled', - choices : [ - 'enabled', 'disabled', - ], description : 'Build Ray Tracing on supported hardware.' )