[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch wip-riscv updated: gnu: mesa: Add support for riscv64-linux.
From: |
guix-commits |
Subject: |
branch wip-riscv updated: gnu: mesa: Add support for riscv64-linux. |
Date: |
Thu, 05 Aug 2021 06:48:26 -0400 |
This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch wip-riscv
in repository guix.
The following commit(s) were added to refs/heads/wip-riscv by this push:
new 0329a10 gnu: mesa: Add support for riscv64-linux.
0329a10 is described below
commit 0329a10fdbbf733e369d18ae1924c06aa841bb33
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Thu Aug 5 12:49:23 2021 +0300
gnu: mesa: Add support for riscv64-linux.
* gnu/packages/gl.scm (mesa)[inputs]: Add llvm-11 on riscv64-linux.
[native-inputs]: Add glslang on riscv64-linux.
[arguments]: In configure-flags adjust gallium-drivers to swap the
power* and intel drivers for the fallback option. Specify riscv64-linux
configure options for vulkan-drivers. Enable the vulkan-overlay-layer
and llvm support. Adjust the custom 'disable-failing-test phase to have
a riscv64-linux section.
---
gnu/packages/gl.scm | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index cc5131b..0cd68fc 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -272,7 +272,7 @@ also known as DXTn or DXTC) for Mesa.")
("libxrandr" ,libxrandr)
("libxvmc" ,libxvmc)
,@(match (%current-system)
- ((or "x86_64-linux" "i686-linux" "powerpc64le-linux"
"aarch64-linux" "powerpc-linux")
+ ((or "x86_64-linux" "i686-linux" "powerpc64le-linux"
"aarch64-linux" "powerpc-linux" "riscv64-linux")
;; Note: update the 'clang' input of mesa-opencl when bumping
this.
`(("llvm" ,llvm-11)))
(_
@@ -284,7 +284,7 @@ also known as DXTn or DXTC) for Mesa.")
("flex" ,flex)
("gettext" ,gettext-minimal)
,@(match (%current-system)
- ((or "x86_64-linux" "i686-linux" "powerpc64le-linux"
"aarch64-linux" "powerpc-linux")
+ ((or "x86_64-linux" "i686-linux" "powerpc64le-linux"
"aarch64-linux" "powerpc-linux" "riscv64-linux")
`(("glslang" ,glslang)))
(_
`()))
@@ -299,10 +299,10 @@ also known as DXTn or DXTC) for Mesa.")
((or "armhf-linux" "aarch64-linux")
;; TODO: Fix svga driver for non-Intel architectures.
'("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl"))
- ((or "powerpc64le-linux" "powerpc-linux")
- '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl"))
+ ((or "x86_64-linux" "i686-linux")
+
'("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl"))
(_
-
'("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl")))
+ '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl")))
;; Enable various optional features. TODO: opencl requires libclc,
;; omx requires libomxil-bellagio
"-Dplatforms=x11,wayland"
@@ -325,12 +325,14 @@ also known as DXTn or DXTC) for Mesa.")
'("-Dvulkan-drivers=amd"))
("aarch64-linux"
'("-Dvulkan-drivers=freedreno,amd"))
+ ("riscv64-linux"
+ '("-Dvulkan-drivers=amd,swrast"))
(_
'("-Dvulkan-drivers=auto")))
;; Enable the Vulkan overlay layer on architectures using llvm.
,@(match (%current-system)
- ((or "x86_64-linux" "i686-linux" "powerpc64le-linux"
"aarch64-linux" "powerpc-linux")
+ ((or "x86_64-linux" "i686-linux" "powerpc64le-linux"
"aarch64-linux" "powerpc-linux" "riscv64-linux")
'("-Dvulkan-overlay-layer=true"))
(_
'()))
@@ -344,7 +346,7 @@ also known as DXTn or DXTC) for Mesa.")
((or "x86_64-linux" "i686-linux")
'("-Ddri-drivers=i915,i965,nouveau,r200,r100"
"-Dllvm=enabled")) ; default is x86/x86_64 only
- ((or "powerpc64le-linux" "aarch64-linux" "powerpc-linux")
+ ((or "powerpc64le-linux" "aarch64-linux" "powerpc-linux"
"riscv64-linux")
'("-Ddri-drivers=nouveau,r200,r100"
"-Dllvm=enabled"))
(_
@@ -363,6 +365,13 @@ also known as DXTn or DXTC) for Mesa.")
(add-after 'unpack 'disable-failing-test
(lambda _
,@(match (%current-system)
+ ("riscv64-linux"
+ ;; According to the test logs the llvm JIT is not designed
+ ;; for this architecture and the llvmpipe tests all segfault.
+ ;; The same is true for mesa:gallium / osmesa-render.
+ `((substitute* '("src/gallium/drivers/llvmpipe/meson.build"
+ "src/gallium/targets/osmesa/meson.build")
+ (("if with_tests") "if false"))))
("powerpc64le"
;; Disable some of the llvmpipe tests.
`((substitute* "src/gallium/drivers/llvmpipe/lp_test_arit.c"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch wip-riscv updated: gnu: mesa: Add support for riscv64-linux.,
guix-commits <=