mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

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 <jordan.l.justen@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19332>
This commit is contained in:
Luis Felipe Strano Moraes 2022-10-26 15:08:22 -07:00 committed by Marge Bot
parent fda7d17e81
commit 2842c04bf5
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -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

9
meson_options.txt
View File

@ -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',