From f7c82c72c42432e2bbac7b8defa0a72435960e6c Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Sat, 5 Mar 2022 16:57:03 -0800 Subject: [PATCH] meson: Deprecate vulkan-rt-drivers intel Signed-off-by: Jordan Justen Reviewed-by: Lionel Landwerlin Acked-by: Caio Oliveira Part-of: --- meson.build | 5 +++++ meson_options.txt | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/meson.build b/meson.build index 3afdbcd0956..a9ae2f87973 100644 --- a/meson.build +++ b/meson.build @@ -283,6 +283,11 @@ 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 diff --git a/meson_options.txt b/meson_options.txt index 95d07964e28..64caadbb4fc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -201,6 +201,13 @@ 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',