meson: Remove experimental from gfxstream driver build

We (QNX) is using this with our VMM, and our Linux reference distro (which is currently in development).
With libaemu removed, it's much easier to integrate into a Linux-guest
build.

Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32161>
This commit is contained in:
Aaron Ruby 2024-11-15 11:12:23 -05:00 committed by Marge Bot
parent 0fb4609d94
commit 4614097756
2 changed files with 4 additions and 4 deletions

View File

@ -242,7 +242,7 @@ elif _vulkan_drivers.contains('all')
_vulkan_drivers = ['amd', 'intel', 'intel_hasvk', 'swrast', _vulkan_drivers = ['amd', 'intel', 'intel_hasvk', 'swrast',
'freedreno', 'panfrost', 'virtio', 'broadcom', 'freedreno', 'panfrost', 'virtio', 'broadcom',
'imagination-experimental', 'microsoft-experimental', 'imagination-experimental', 'microsoft-experimental',
'nouveau', 'asahi', 'gfxstream-experimental'] 'nouveau', 'asahi', 'gfxstream']
endif endif
with_intel_vk = _vulkan_drivers.contains('intel') with_intel_vk = _vulkan_drivers.contains('intel')
@ -258,7 +258,7 @@ with_imagination_srv = get_option('imagination-srv')
with_microsoft_vk = _vulkan_drivers.contains('microsoft-experimental') with_microsoft_vk = _vulkan_drivers.contains('microsoft-experimental')
with_nouveau_vk = _vulkan_drivers.contains('nouveau') with_nouveau_vk = _vulkan_drivers.contains('nouveau')
with_asahi_vk = _vulkan_drivers.contains('asahi') with_asahi_vk = _vulkan_drivers.contains('asahi')
with_gfxstream_vk = _vulkan_drivers.contains('gfxstream-experimental') with_gfxstream_vk = _vulkan_drivers.contains('gfxstream')
with_any_vk = _vulkan_drivers.length() != 0 with_any_vk = _vulkan_drivers.length() != 0
if with_any_vk and host_machine.system() == 'windows' and meson.version().version_compare('< 1.3') if with_any_vk and host_machine.system() == 'windows' and meson.version().version_compare('< 1.3')

View File

@ -205,8 +205,8 @@ option(
value : ['auto'], value : ['auto'],
choices : ['auto', 'amd', 'broadcom', 'freedreno', 'intel', 'intel_hasvk', choices : ['auto', 'amd', 'broadcom', 'freedreno', 'intel', 'intel_hasvk',
'panfrost', 'swrast', 'virtio', 'imagination-experimental', 'panfrost', 'swrast', 'virtio', 'imagination-experimental',
'microsoft-experimental', 'nouveau', 'asahi', 'microsoft-experimental', 'nouveau', 'asahi', 'gfxstream',
'gfxstream-experimental', 'all'], 'all'],
description : 'List of vulkan drivers to build. If this is set to auto ' + description : 'List of vulkan drivers to build. If this is set to auto ' +
'all drivers applicable to the target OS/architecture ' + 'all drivers applicable to the target OS/architecture ' +
'will be built' 'will be built'