From 2842c04bf50ea2d7bf6a45c898558277f3f8c69f Mon Sep 17 00:00:00 2001 From: Luis Felipe Strano Moraes Date: Wed, 26 Oct 2022 15:08:22 -0700 Subject: [PATCH] meson: simplified meson for enabling ray-tracing on Intel Removed warning about deprecated usage that was not necessary. Also added information on whether support is enabled or not to the summary so it is easier to check when building. Reviewed-by: Jordan Justen Reviewed-by: Lionel Landwerlin Part-of: --- meson.build | 8 ++------ meson_options.txt | 9 +-------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/meson.build b/meson.build index 7f86a0ec9853b..6289f11afd0be 100644 --- a/meson.build +++ b/meson.build @@ -286,11 +286,6 @@ with_imagination_srv = get_option('imagination-srv') with_microsoft_vk = _vulkan_drivers.contains('microsoft-experimental') with_any_vk = _vulkan_drivers.length() != 0 -_vulkan_rt_drivers = get_option('vulkan-rt-drivers') -if _vulkan_rt_drivers.contains('intel') - error('Use -Dintel-clc=enabled to enable Intel Vulkan Ray Tracing') -endif - with_any_broadcom = with_gallium_vc4 or with_gallium_v3d or with_broadcom_vk with_any_intel = with_intel_vk or with_intel_hasvk or with_gallium_iris or with_gallium_crocus or with_intel_tools @@ -306,7 +301,7 @@ endif with_microsoft_clc = get_option('microsoft-clc').enabled() with_intel_clc = get_option('intel-clc').enabled() -with_intel_vk_rt = with_intel_clc +with_intel_vk_rt = with_intel_vk and with_intel_clc with_clc = with_microsoft_clc or with_intel_clc with_libclc = with_clc with_spirv_to_dxil = get_option('spirv-to-dxil') @@ -2358,6 +2353,7 @@ if with_any_vk if with_any_vulkan_layers lines += 'Vulkan layers: ' + ' '.join(get_option('vulkan-layers')) endif + lines += 'Vulkan Intel Ray Tracing: ' + (with_intel_vk_rt ? 'yes' : 'no') else lines += 'Vulkan drivers: no' endif diff --git a/meson_options.txt b/meson_options.txt index 28a4b5e75f6c0..6f307018815b0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -188,13 +188,6 @@ option( choices : ['auto', 'amd', 'broadcom', 'freedreno', 'imagination-experimental', 'intel', 'intel_hasvk', 'microsoft-experimental', 'panfrost', 'swrast', 'virtio-experimental'], description : 'List of vulkan drivers to build. If this is set to auto all drivers applicable to the target OS/architecture will be built' ) -option( - 'vulkan-rt-drivers', - type : 'array', - value : ['auto'], - choices : ['auto', 'intel'], - description : 'List of vulkan drivers to enable ray-tracing support on. If this is set to auto all drivers applicable to the target OS/architecture will enabled ray-tracing support.' -) option( 'freedreno-kgsl', type : 'boolean', @@ -531,7 +524,7 @@ option( 'intel-clc', type : 'feature', value : 'disabled', - description : 'Build the intel-clc compiler (required for ray queries).' + description : 'Build the intel-clc compiler (enables Vulkan Intel Ray Tracing on supported hardware).' ) option( 'video-codecs',