amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mesa: Update configure flags.

Browse source 
Previously, in 1ed0283fcc, mesa's configuration
options were altered to use "auto" as needed, while it looks like this was
inadvertently changed in 9b2a3e023f.  This meant
i915 dropped from x86/x86_64.  This commit restores the "auto" behavior where
it matched our previous driver list (or restored missing drivers).  See mesa's
meson.build for all options.

* gnu/packages/gl.scm (mesa)[arguments]: For gallium-drivers, use
"softpipe,llvmpipe" instead of the deprecated "swrast" option.  Use "auto"
in gallium-drivers and vulkan-drivers where it provides the same driver
list (or restores ones dropped from x86/x86_64).  Comment on differences from
"auto" where we don't use it.

Change-Id: I920701f71d19578f4913fda7372273955f0a9847
This commit is contained in:
John Kehayias 2024-09-08 20:13:33 -04:00
parent e00c621cbb
commit fda63ca521
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/gl.scm
View file

@ -361,16 +361,18 @@ also known as DXTn or DXTC) for Mesa.")
#~(list #~(list
#$@(cond #$@(cond
((target-aarch64?) ((target-aarch64?)
;; This includes more drivers than "auto": asahi, r300, r600
'("-Dgallium-drivers=asahi,etnaviv,freedreno,kmsro,lima,\ '("-Dgallium-drivers=asahi,etnaviv,freedreno,kmsro,lima,\
nouveau,panfrost,r300,r600,svga,swrast,tegra,v3d,vc4,virgl,zink")) nouveau,panfrost,r300,r600,svga,softpipe,llvmpipe,tegra,v3d,vc4,virgl,zink"))
((target-arm32?) ((target-arm32?)
;; This includes more drivers than "auto": r300, r600
'("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,\ '("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,\
panfrost,r300,r600,svga,swrast,tegra,v3d,vc4,virgl,zink")) panfrost,r300,r600,svga,softpipe,llvmpipe,tegra,v3d,vc4,virgl,zink"))
((or (target-ppc64le?) (target-ppc32?) (target-riscv64?)) ((or (target-ppc64le?) (target-ppc32?) (target-riscv64?))
'("-Dgallium-drivers=nouveau,r300,r600,radeonsi,svga,swrast,virgl,zink")) ;; This include more drivers than "auto": svga
'("-Dgallium-drivers=nouveau,r300,r600,radeonsi,svga,softpipe,llvmpipe,virgl,zink"))
(else (else
'("-Dgallium-drivers=crocus,iris,nouveau,r300,r600,radeonsi,\ '("-Dgallium-drivers=auto")))
svga,swrast,virgl,zink")))
;; 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"
@ -385,16 +387,15 @@ svga,swrast,virgl,zink")))
"-Dgbm=enabled" "-Dgbm=enabled"
"-Dshared-glapi=enabled" "-Dshared-glapi=enabled"
;; Explicitly enable Vulkan on some architectures.
#$@(cond #$@(cond
((or (target-x86-32?) (target-x86-64?)) ((or (target-x86-32?) (target-x86-64?))
;; This doesn't include nouveau (which is in "auto") as it needs
;; rust.
;; TODO: Enable nouveau/NVK.
'("-Dvulkan-drivers=intel,intel_hasvk,amd,swrast")) '("-Dvulkan-drivers=intel,intel_hasvk,amd,swrast"))
((or (target-ppc64le?) (target-ppc32?))
'("-Dvulkan-drivers=amd,swrast"))
((target-aarch64?) ((target-aarch64?)
;; This differs from "auto" which only includes swrast and intel
'("-Dvulkan-drivers=freedreno,amd,broadcom,swrast")) '("-Dvulkan-drivers=freedreno,amd,broadcom,swrast"))
((target-riscv64?)
'("-Dvulkan-drivers=amd,swrast"))
(else (else
'("-Dvulkan-drivers=auto"))) '("-Dvulkan-drivers=auto")))