nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: mesa: Use llvm backend for Intel hardware only. 

* gnu/packages/gl.scm (mesa)[inputs]: Only use llvm for i686-linux and
x86_64-linux.
[arguments]: Only pass '--enable-gallium-llvm' to 'configure on
i686-linux and x86_64-linux.
This commit is contained in:
Efraim Flashner 2017-03-14 20:00:03 +02:00
parent 49c2a46e74
commit c5e91014a2
No known key found for this signature in database
GPG Key ID: F4C1D3917EACEE93
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/gl.scm
View File

@ -6,6 +6,7 @@
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is> ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -228,10 +229,14 @@ also known as DXTn or DXTC) for Mesa.")
("libxml2" ,libxml2) ("libxml2" ,libxml2)
;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support ;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support
("libxvmc" ,libxvmc) ("libxvmc" ,libxvmc)
,@(match (%current-system)
((or "x86_64-linux" "i686-linux")
`(("llvm" ,llvm)))
(_
`()))
("makedepend" ,makedepend) ("makedepend" ,makedepend)
("presentproto" ,presentproto) ("presentproto" ,presentproto)
("s2tc" ,s2tc) ("s2tc" ,s2tc)
("llvm" ,llvm)
("wayland" ,wayland))) ("wayland" ,wayland)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
@ -239,7 +244,6 @@ also known as DXTn or DXTC) for Mesa.")
(arguments (arguments
`(#:configure-flags `(#:configure-flags
'("--with-gallium-drivers=i915,r300,r600,svga,swrast,nouveau,virgl" '("--with-gallium-drivers=i915,r300,r600,svga,swrast,nouveau,virgl"
"--enable-gallium-llvm"
;; Enable various optional features. TODO: opencl requires libclc, ;; Enable various optional features. TODO: opencl requires libclc,
;; omx requires libomxil-bellagio ;; omx requires libomxil-bellagio
"--with-egl-platforms=x11,drm,wayland" "--with-egl-platforms=x11,drm,wayland"
@ -255,12 +259,13 @@ also known as DXTn or DXTC) for Mesa.")
;; Without floating point texture support, drivers such as Nouveau ;; Without floating point texture support, drivers such as Nouveau
;; are stuck at OpenGL 2.1 instead of OpenGL 3.0+. ;; are stuck at OpenGL 2.1 instead of OpenGL 3.0+.
"--enable-texture-float" "--enable-texture-float"
;; on non-intel systems, drop i915 and i965 ;; on non-intel systems, drop i915 and i965
;; from the default dri drivers ;; from the default dri drivers
,@(match (%current-system) ,@(match (%current-system)
((or "x86_64-linux" "i686-linux") ((or "x86_64-linux" "i686-linux")
'()) '("--with-dri-drivers=915,i965,nouveau,r200,radeon,swrast"
"--enable-gallium-llvm")) ; default is x86/x86_64 only
(_ (_
'("--with-dri-drivers=nouveau,r200,radeon,swrast")))) '("--with-dri-drivers=nouveau,r200,radeon,swrast"))))
#:phases #:phases