From 1f144081ec1656636ca72e358e666174a5c166f0 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Sun, 9 Nov 2025 22:47:56 +0100 Subject: [PATCH] meson: Add asahi to aarch64's auto-generated drivers Since the Apple silicon M1 and M2 series of SoCs support only aarch64 split the lists for 'arm' and 'aarch64'. Signed-off-by: Janne Grunau Part-of: --- meson.build | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index c296dd0060e..8fbc3fcd44a 100644 --- a/meson.build +++ b/meson.build @@ -156,7 +156,13 @@ if gallium_drivers.contains('auto') 'r300', 'r600', 'radeonsi', 'nouveau', 'virgl', 'svga', 'llvmpipe', 'softpipe', 'iris', 'crocus', 'i915', 'zink' ] - elif ['arm', 'aarch64'].contains(host_machine.cpu_family()) + elif ['aarch64'].contains(host_machine.cpu_family()) + gallium_drivers = [ + 'v3d', 'vc4', 'freedreno', 'etnaviv', 'nouveau', 'svga', + 'tegra', 'virgl', 'lima', 'panfrost', 'llvmpipe', 'softpipe', 'iris', + 'zink', 'asahi' + ] + elif ['arm'].contains(host_machine.cpu_family()) gallium_drivers = [ 'v3d', 'vc4', 'freedreno', 'etnaviv', 'nouveau', 'svga', 'tegra', 'virgl', 'lima', 'panfrost', 'llvmpipe', 'softpipe', 'iris', @@ -249,7 +255,9 @@ if _vulkan_drivers.contains('auto') if system_has_kms_drm if host_machine.cpu_family().startswith('x86') _vulkan_drivers = ['amd', 'intel', 'intel_hasvk', 'nouveau', 'swrast'] - elif ['arm', 'aarch64'].contains(host_machine.cpu_family()) + elif ['aarch64'].contains(host_machine.cpu_family()) + _vulkan_drivers = ['swrast', 'intel', 'panfrost', 'freedreno', 'asahi'] + elif ['arm'].contains(host_machine.cpu_family()) _vulkan_drivers = ['swrast', 'intel', 'panfrost', 'freedreno'] elif ['mips', 'mips64', 'ppc', 'ppc64', 'riscv32', 'riscv64'].contains(host_machine.cpu_family()) _vulkan_drivers = ['amd', 'swrast']