gnu: mesa: Update configure flags.

* gnu/packages/gl.scm (mesa)[configure-flags]: Adjust the gallium-drivers and
vulkan-drivers flags to use "auto" where it is available and enables at least
the previously listed drivers.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
John Kehayias 2022-06-22 11:19:39 -04:00 committed by Efraim Flashner
parent cf07287619
commit 1ed0283fcc
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351

View file

@ -15,7 +15,7 @@
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru> ;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -320,10 +320,10 @@ (define-public mesa
("armhf-linux" ("armhf-linux"
;; Freedreno FTBFS when built on a 64-bit machine. ;; Freedreno FTBFS when built on a 64-bit machine.
'("-Dgallium-drivers=etnaviv,kmsro,lima,nouveau,panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl")) '("-Dgallium-drivers=etnaviv,kmsro,lima,nouveau,panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl"))
((or "powerpc64le-linux" "powerpc-linux" "riscv64-linux") ((or "powerpc64le-linux" "powerpc-linux")
'("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl")) '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl"))
(_ (_
'("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl"))) '("-Dgallium-drivers=auto")))
;; Enable various optional features. TODO: opencl requires libclc, ;; Enable various optional features. TODO: opencl requires libclc,
;; omx requires libomxil-bellagio ;; omx requires libomxil-bellagio
"-Dplatforms=x11,wayland" "-Dplatforms=x11,wayland"
@ -340,14 +340,10 @@ (define-public mesa
;; Explicitly enable Vulkan on some architectures. ;; Explicitly enable Vulkan on some architectures.
,@(match (%current-system) ,@(match (%current-system)
((or "i686-linux" "x86_64-linux")
'("-Dvulkan-drivers=intel,amd"))
((or "powerpc64le-linux" "powerpc-linux") ((or "powerpc64le-linux" "powerpc-linux")
'("-Dvulkan-drivers=amd,swrast")) '("-Dvulkan-drivers=amd,swrast"))
("aarch64-linux" ("aarch64-linux"
'("-Dvulkan-drivers=freedreno,amd,broadcom,swrast")) '("-Dvulkan-drivers=freedreno,amd,broadcom,swrast"))
("riscv64-linux"
'("-Dvulkan-drivers=amd,swrast"))
(_ (_
'("-Dvulkan-drivers=auto"))) '("-Dvulkan-drivers=auto")))