From 46140977563d69428a1db23ee22d374f9b523d80 Mon Sep 17 00:00:00 2001
From: Aaron Ruby <aruby@blackberry.com>
Date: Fri, 15 Nov 2024 11:12:23 -0500
Subject: [PATCH] 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>
---
 meson.build       | 4 ++--
 meson_options.txt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index b72c3ec50d8..01604867961 100644
--- a/meson.build
+++ b/meson.build
@@ -242,7 +242,7 @@ elif _vulkan_drivers.contains('all')
    _vulkan_drivers = ['amd', 'intel', 'intel_hasvk', 'swrast',
                       'freedreno', 'panfrost', 'virtio', 'broadcom',
                       'imagination-experimental', 'microsoft-experimental',
-                      'nouveau', 'asahi', 'gfxstream-experimental']
+                      'nouveau', 'asahi', 'gfxstream']
 endif
 
 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_nouveau_vk = _vulkan_drivers.contains('nouveau')
 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
 
 if with_any_vk and host_machine.system() == 'windows' and meson.version().version_compare('< 1.3')
diff --git a/meson_options.txt b/meson_options.txt
index bc29efd6a01..42e819dacd2 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -205,8 +205,8 @@ option(
   value : ['auto'],
   choices : ['auto', 'amd', 'broadcom', 'freedreno', 'intel', 'intel_hasvk',
              'panfrost', 'swrast', 'virtio', 'imagination-experimental',
-             'microsoft-experimental', 'nouveau', 'asahi',
-             'gfxstream-experimental', 'all'],
+             'microsoft-experimental', 'nouveau', 'asahi', 'gfxstream',
+             'all'],
   description : 'List of vulkan drivers to build. If this is set to auto ' +
                 'all drivers applicable to the target OS/architecture ' +
                 'will be built'