On 9 February 2011 12:55, Cyril Brulebois <k...@debian.org> wrote: > > a patch against debian-unstable/7.10-3 would be appreciated. > > KiBi.
It's quite simple. It affects - swrast when dri-experimental is installed - gallium based drivers - fallbacks are now llvm based (currently r300?) Note that mesa currently builds r600g but does not ship it, perhaps it could be also added to dri-experimental. I am not sure how useful the version in 7.10 is but it should improve over time. Thanks Michal
diff -urN mesa-7.10/debian/control mesa-7.10.mod/debian/control --- mesa-7.10/debian/control 2011-02-09 20:00:17.000000000 +0100 +++ mesa-7.10.mod/debian/control 2011-02-09 19:56:29.000000000 +0100 @@ -11,7 +11,7 @@ libxdamage-dev, libxext-dev, autoconf, automake, x11proto-dri2-dev (>= 2.1), linux-libc-dev (>= 2.6.31) [linux-any], libx11-xcb-dev, libxcb-dri2-0-dev, libxcb-xfixes0-dev, python-libxml2, - libtalloc-dev, libudev-dev [linux-any], + libtalloc-dev, libudev-dev [linux-any], llvm-dev, Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/mesa Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/mesa.git Homepage: http://mesa3d.sourceforge.net/ diff -urN mesa-7.10/debian/libgl1-mesa-dri-experimental.install mesa-7.10.mod/debian/libgl1-mesa-dri-experimental.install --- mesa-7.10/debian/libgl1-mesa-dri-experimental.install 2011-02-09 20:00:17.000000000 +0100 +++ mesa-7.10.mod/debian/libgl1-mesa-dri-experimental.install 2011-02-09 22:50:46.000000000 +0100 @@ -1 +1,2 @@ build/dri/lib/gallium/nouveau_dri.so usr/lib/dri +build/dri/lib/gallium/swrastg_dri.so usr/lib/dri diff -urN mesa-7.10/debian/patches/11-load-swrastg-before-swrast.diff mesa-7.10.mod/debian/patches/11-load-swrastg-before-swrast.diff --- mesa-7.10/debian/patches/11-load-swrastg-before-swrast.diff 1970-01-01 01:00:00.000000000 +0100 +++ mesa-7.10.mod/debian/patches/11-load-swrastg-before-swrast.diff 2011-02-09 19:54:49.000000000 +0100 @@ -0,0 +1,15 @@ +--- mesa/src/glx/drisw_glx.c~ 2010-10-02 00:51:28.000000000 +0200 ++++ mesa/src/glx/drisw_glx.c 2010-10-26 22:40:48.000000000 +0200 +@@ -426,10 +426,10 @@ + void *driver = NULL; + + if (driver == NULL) +- driver = driOpenDriver("swrast"); ++ driver = driOpenDriver("swrastg"); + + if (driver == NULL) +- driver = driOpenDriver("swrastg"); ++ driver = driOpenDriver("swrast"); + + return driver; + } diff -urN mesa-7.10/debian/patches/series mesa-7.10.mod/debian/patches/series --- mesa-7.10/debian/patches/series 2011-02-09 20:00:17.000000000 +0100 +++ mesa-7.10.mod/debian/patches/series 2011-02-09 19:55:09.000000000 +0100 @@ -4,3 +4,4 @@ 06_kfreebsd-ftbfs.diff 08-kfreebsd-gallium.diff 10-fix-talloc-linking.diff +11-load-swrastg-before-swrast.diff diff -urN mesa-7.10/debian/rules mesa-7.10.mod/debian/rules --- mesa-7.10/debian/rules 2011-02-09 20:00:17.000000000 +0100 +++ mesa-7.10.mod/debian/rules 2011-02-09 19:58:06.000000000 +0100 @@ -91,6 +91,7 @@ confflags-dri = \ --with-driver=dri \ + --enable-gallium-llvm \ --with-dri-drivers="$(DRI_DRIVERS)" \ --with-dri-driverdir=/usr/lib/dri \ --with-egl-platforms="$(EGL_DISPLAYS)" \
