metalefty/mesa
1
0
Fork 0
forked from rpms/mesa
Code Pull Requests Activity

Switch to swrast classic instead of softpipe for non-llvm arches

Browse Source 
- Re-disable llvm on ppc until it can draw pixels
This commit is contained in:
Adam Jackson 2012-09-24 14:53:26 -04:00
parent ff3f075790
commit 63e439c487
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mesa.spec
View File

@ -7,9 +7,11 @@
%define with_hardware 0 %define with_hardware 0
%define dri_drivers --with-dri-drivers=swrast %define dri_drivers --with-dri-drivers=swrast
%else %else
# llvm support only works on some arches # llvm support only works on some arches (ppc back off for the moment)
%ifarch %{ix86} x86_64 ppc ppc64 ppc64p7 %{arm} %ifarch %{ix86} x86_64 %{arm}
%define with_llvm 1 %define with_llvm 1
%else
%define swrastc ,swrast
%endif %endif
%define with_hardware 1 %define with_hardware 1
%define base_drivers nouveau,radeon,r200 %define base_drivers nouveau,radeon,r200
@ -24,7 +26,7 @@
%ifarch ia64 %ifarch ia64
%define platform_drivers ,i915 %define platform_drivers ,i915
%endif %endif
%define dri_drivers --with-dri-drivers=%{base_drivers}%{?platform_drivers} %define dri_drivers --with-dri-drivers=%{base_drivers}%{?platform_drivers}%{?swrastc}
%endif %endif
%define _default_patch_fuzz 2 %define _default_patch_fuzz 2
@ -36,7 +38,7 @@
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 9.0 Version: 9.0
Release: 0.1%{?dist} Release: 0.2%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -322,11 +324,10 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
--enable-gallium-llvm \ --enable-gallium-llvm \
--with-llvm-shared-libs \ --with-llvm-shared-libs \
%else %else
--with-gallium-drivers=%{?with_vmware:svga,}r300,r600,nouveau,swrast \ --with-gallium-drivers=%{?with_vmware:svga,}r300,r600,nouveau \
%endif %endif
%else %else
--disable-gallium-llvm \ --disable-gallium-llvm \
--with-gallium-drivers=swrast \
--enable-dri \ --enable-dri \
%endif %endif
%{?dri_drivers} %{?dri_drivers}
@ -590,6 +591,10 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Mon Sep 24 2012 Adam Jackson <ajax@redhat.com> 9.0-0.2
- Switch to swrast classic instead of softpipe for non-llvm arches
- Re-disable llvm on ppc until it can draw pixels
* Mon Sep 24 2012 Dave Airlie <airlied@redhat.com> 9.0-0.1 * Mon Sep 24 2012 Dave Airlie <airlied@redhat.com> 9.0-0.1
- rebase to latest upstream 9.0 pre-release branch - rebase to latest upstream 9.0 pre-release branch
- add back glu from new upstream (split for f18 later) - add back glu from new upstream (split for f18 later)