summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Justen <jordan.l.justen@intel.com>2022-03-05 16:57:03 -0800
committerMarge Bot <emma+marge@anholt.net>2022-09-28 05:38:37 +0000
commitf7c82c72c42432e2bbac7b8defa0a72435960e6c (patch)
tree96f7b31712af64541dd3b664e4cd692ddee6c1a1
parente565d1e4ea540c1a357d008ba266863df0efc754 (diff)
downloadmesa-f7c82c72c42432e2bbac7b8defa0a72435960e6c.tar.gz
mesa-f7c82c72c42432e2bbac7b8defa0a72435960e6c.tar.bz2
mesa-f7c82c72c42432e2bbac7b8defa0a72435960e6c.zip
meson: Deprecate vulkan-rt-drivers intel
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Acked-by: Caio Oliveira <caio.oliveira@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16970>
-rw-r--r--meson.build5
-rw-r--r--meson_options.txt7
2 files changed, 12 insertions, 0 deletions
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
@@ -202,6 +202,13 @@ option(
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',
value : false,