From 45491ea8da85ad977ca11f4595a7ddeb22146b0d Mon Sep 17 00:00:00 2001 From: Lilah Tascheter Date: Sat, 8 Jul 2023 13:29:28 -0500 Subject: gnu: mesa: Fix Vulkan on older Intel GPUs. Mesa split the Vulkan intel driver into two: intel and intel_hasvk. Enables intel_hasvk so vulkan functions on older intel GPUs again, and swrast for lavapipe as a fallback. * gnu/packages/gl.scm (mesa-vulkan-hasvk): New variable. (mesa): Graft with mesa-vulkan-hasvk. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gl.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 9885bde712..1691086e1a 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -279,6 +279,7 @@ also known as DXTn or DXTC) for Mesa.") (base32 "1mcjf41x2bhxs6yxars7nh2vfryfw50g6rvbcfbb1wqdv2jn4qrq")))) (build-system meson-build-system) + (replacement mesa-vulkan-hasvk) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. (list libdrm @@ -526,6 +527,21 @@ device drivers allows Mesa to be used in many different environments ranging from software emulation to complete hardware acceleration for modern GPUs.") (license license:x11))) +(define mesa-vulkan-hasvk + (let ((graft mesa) + (vulk "-Dvulkan-drivers=intel,amd")) + (package + (inherit graft) + (arguments + (substitute-keyword-arguments (package-arguments graft) + ((#:configure-flags flags) + #~(begin + (use-modules (ice-9 match)) + (map (match-lambda + (#$vulk (string-append #$vulk ",intel_hasvk,swrast")) + (x x)) + #$flags)))))))) + (define-public mesa-opencl (package/inherit mesa (name "mesa-opencl") -- cgit v1.2.3 From c7cf2efb7abcc7a5a7ce9606c9d876d00ddde9ad Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 13 Jun 2023 13:10:43 +0000 Subject: gnu: mesa: Fix VDPAU drivers path. The VDPAU_DRIVER_PATH environment variable must contain only one directory. * gnu/packages/gl.scm (mesa)[native-search-paths]: Fix specification for VDPAU_DRIVER_PATH. Signed-off-by: John Kehayias --- gnu/packages/gl.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 1691086e1a..d42903cc8f 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -518,6 +518,7 @@ svga,swrast,virgl"))) (list (search-path-specification ;; Ensure the Mesa VDPAU drivers can be found. (variable "VDPAU_DRIVER_PATH") + (separator #f) (files '("lib/vdpau"))))) (home-page "https://mesa3d.org/") (synopsis "OpenGL and Vulkan implementations") -- cgit v1.2.3 From 9d4cd681daaa8c368858f8f718773a71494743dd Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Tue, 25 Jul 2023 16:18:30 -0400 Subject: gnu: mesa: Ungraft. * gnu/packages/gl.scm (mesa)[configure-flags]: Add intel_hasvk and swrast to vulkan-drivers. [replacement]: Remove. (mesa-vulkan-hasvk): Remove variable. --- gnu/packages/gl.scm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index d42903cc8f..9325d41907 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -279,7 +279,6 @@ also known as DXTn or DXTC) for Mesa.") (base32 "1mcjf41x2bhxs6yxars7nh2vfryfw50g6rvbcfbb1wqdv2jn4qrq")))) (build-system meson-build-system) - (replacement mesa-vulkan-hasvk) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. (list libdrm @@ -346,7 +345,7 @@ svga,swrast,virgl"))) ;; Explicitly enable Vulkan on some architectures. #$@(match (%current-system) ((or "i686-linux" "x86_64-linux") - '("-Dvulkan-drivers=intel,amd")) + '("-Dvulkan-drivers=intel,intel_hasvk,amd,swrast")) ((or "powerpc64le-linux" "powerpc-linux") '("-Dvulkan-drivers=amd,swrast")) ("aarch64-linux" @@ -528,21 +527,6 @@ device drivers allows Mesa to be used in many different environments ranging from software emulation to complete hardware acceleration for modern GPUs.") (license license:x11))) -(define mesa-vulkan-hasvk - (let ((graft mesa) - (vulk "-Dvulkan-drivers=intel,amd")) - (package - (inherit graft) - (arguments - (substitute-keyword-arguments (package-arguments graft) - ((#:configure-flags flags) - #~(begin - (use-modules (ice-9 match)) - (map (match-lambda - (#$vulk (string-append #$vulk ",intel_hasvk,swrast")) - (x x)) - #$flags)))))))) - (define-public mesa-opencl (package/inherit mesa (name "mesa-opencl") -- cgit v1.2.3 From 090c254fe7713db330636dae2c204c8282207cc8 Mon Sep 17 00:00:00 2001 From: Sigve Sudland Date: Wed, 19 Jul 2023 23:02:34 +0200 Subject: gnu: mesa: Enable zstd compression for shader cache. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gl.scm (mesa)[inputs]: Add zstd:lib. [arguments]: Add '-Dzstd=enabled' to configure-flags. Signed-off-by: 宋文武 --- gnu/packages/gl.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 9325d41907..86be6e0bb1 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -298,7 +298,8 @@ also known as DXTn or DXTC) for Mesa.") libxvmc llvm-for-mesa wayland - wayland-protocols)) + wayland-protocols + `(,zstd "lib"))) (native-inputs (list bison flex @@ -362,6 +363,9 @@ svga,swrast,virgl"))) ;; 21.3.x releases to avoid functionality regressions. "-Dvideo-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc" + ;; Enable ZSTD compression for shader cache. + "-Dzstd=enabled" + ;; Also enable the tests. "-Dbuild-tests=true" -- cgit v1.2.3 From 4f0ce65b74a3d28bf6ecbe4c15052dd0de22b284 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Thu, 29 Jun 2023 11:57:59 -0400 Subject: gnu: mesa: Update to 23.1.4. * gnu/packages/gl.scm (mesa): Update to 23.1.4. --- gnu/packages/gl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gl.scm') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 86be6e0bb1..2f7c25bc57 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2020 Kei Kebreau ;;; Copyright © 2021 Ivan Gankevich -;;; Copyright © 2021, 2022 John Kehayias +;;; Copyright © 2021, 2022, 2023 John Kehayias ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Kaelyn Takata ;;; @@ -267,7 +267,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "23.0.3") + (version "23.1.4") (source (origin (method url-fetch) @@ -277,7 +277,7 @@ also known as DXTn or DXTC) for Mesa.") "mesa-" version ".tar.xz"))) (sha256 (base32 - "1mcjf41x2bhxs6yxars7nh2vfryfw50g6rvbcfbb1wqdv2jn4qrq")))) + "0n89l7lvawh85hq2a7g5pp5v017s03qs3n4hbbff6rs8p5zs2qbj")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. -- cgit v1.2.3