diff options
Diffstat (limited to 'source/x/mesa')
| -rwxr-xr-x | source/x/mesa/get-mesa.sh | 2 | ||||
| -rwxr-xr-x | source/x/mesa/mesa.SlackBuild | 34 | ||||
| -rw-r--r-- | source/x/mesa/patches/i915_fragment_shader_disable.patch | 26 | ||||
| -rw-r--r-- | source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch | 89 |
4 files changed, 10 insertions, 141 deletions
diff --git a/source/x/mesa/get-mesa.sh b/source/x/mesa/get-mesa.sh index c014d8a1..253deeb4 100755 --- a/source/x/mesa/get-mesa.sh +++ b/source/x/mesa/get-mesa.sh @@ -1,5 +1,5 @@ # Pull a stable branch + patches -BRANCH=7.9 +BRANCH=7.10 rm -rf mesa git clone git://anongit.freedesktop.org/git/mesa/mesa diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index 7bdc273e..ca670188 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -21,14 +21,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=mesa -VERSION=7.9.2 +VERSION=8.0.4 DEMOVERS=8.0.1 BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j8} # Be sure this list is up-to-date: -DRI_DRIVERS="i810,i915,i965,mach64,mga,nouveau,r128,r200,r300,r600,radeon,savage,sis,tdfx,unichrome,swrast" +DRI_DRIVERS="i915,i965,nouveau,r200,radeon,swrast" if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -59,11 +59,6 @@ cd $TMP rm -rf Mesa-${VERSION} tar xvf $CWD/MesaLib-${VERSION}.tar.?z* || exit 1 -# If MesaLib came from git, we might already have GLUT. -if [ ! -d Mesa-${VERSION}/src/glut/glx ]; then - tar xvf $CWD/MesaGLUT-${VERSION}.tar.?z* || exit 1 -fi - cd Mesa-$VERSION # Make sure ownerships and permissions are sane: @@ -76,21 +71,14 @@ find . \ # Apply patches from git (and maybe elsewhere): # Patches obtained by: -# git checkout origin/7.9 -# git format-patch 67aeab0b77fb6be864088e69ea74a010b6543fa1.. +# git checkout origin/8.0 +# git format-patch 3d657b14b4cab98a2945904823e78cd8950944f4.. # 8.0.3 release if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then for patch in $CWD/patches/*.patch ; do patch -p1 < $patch || exit 1 ; done fi -# Revert "i915: Enable ARB_fragment_shader by default." -# https://bugzilla.redhat.com/show_bug.cgi?id=643399 -zcat $CWD/patches/i915_fragment_shader_disable.patch.gz | patch -p1 || exit 1 - -# Allow to build against libdrm-2.4.23: -zcat $CWD/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch.gz | patch -p1 || exit 1 - if [ ! -r configure ]; then autoreconf || exit 1 fi @@ -104,17 +92,13 @@ CFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/mesa-$VERSION \ --with-dri-driverdir=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \ --with-dri-drivers="$DRI_DRIVERS" \ - --enable-xcb \ - --enable-gallium-nouveau \ + --with-gallium-drivers=nouveau,swrast,r300,r600 \ + --enable-gallium-llvm \ --build=$ARCH-slackware-linux -# --enable-gallium-llvm \ -# --enable-gallium-swrast \ -# --disable-gallium-svga \ -# --disable-gallium-i915 \ -# --disable-gallium-i965 \ -# --disable-gallium-radeon \ -# --disable-gallium-r600 \ +# r300 requires llvm +# Other gallium drivers: +# galahad,i915,identity,llvmpipe,noop,nv50,nvc0,nvfx,rbug,softpipe,svga,trace make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/x/mesa/patches/i915_fragment_shader_disable.patch b/source/x/mesa/patches/i915_fragment_shader_disable.patch deleted file mode 100644 index d2aee8e7..00000000 --- a/source/x/mesa/patches/i915_fragment_shader_disable.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e5a4106be7c8b87821f6b5d21fec99a402825740 Mon Sep 17 00:00:00 2001 -From: Robert Hooker <sarvatt@ubuntu.com> -Date: Wed, 8 Sep 2010 12:33:09 -0400 -Subject: [PATCH] Revert "i915: Enable ARB_fragment_shader by default." - -This reverts commit a58514cc9c5cc5867f9140700462c5ac5749550d. ---- - src/mesa/drivers/dri/intel/intel_screen.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c -index 0a542a7..8ae2cd2 100644 ---- a/src/mesa/drivers/dri/intel/intel_screen.c -+++ b/src/mesa/drivers/dri/intel/intel_screen.c -@@ -70,7 +70,7 @@ PUBLIC const char __driConfigOptions[] = - DRI_CONF_DESC(en, "Enable early Z in classic mode (unstable, 945-only).") - DRI_CONF_OPT_END - -- DRI_CONF_OPT_BEGIN(fragment_shader, bool, true) -+ DRI_CONF_OPT_BEGIN(fragment_shader, bool, false) - DRI_CONF_DESC(en, "Enable limited ARB_fragment_shader support on 915/945.") - DRI_CONF_OPT_END - --- -1.7.2 - diff --git a/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch b/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch deleted file mode 100644 index d0ce04d2..00000000 --- a/source/x/mesa/patches/mesa-7.9-libdrm-2.4.23-nouveau-api.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -ur a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c ---- a/src/gallium/drivers/nouveau/nouveau_screen.c 2010-10-02 00:51:28.000000000 +0200 -+++ b/src/gallium/drivers/nouveau/nouveau_screen.c 2010-12-11 18:18:20.527000045 +0100 -@@ -236,7 +236,7 @@ - int ret; - - ret = nouveau_channel_alloc(dev, 0xbeef0201, 0xbeef0202, -- &screen->channel); -+ 512*1024, &screen->channel); - if (ret) - return ret; - screen->device = dev; -diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c ---- a/src/mesa/drivers/dri/nouveau/nouveau_context.c 2010-10-05 03:58:00.000000000 +0200 -+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c 2010-12-11 18:18:20.528000045 +0100 -@@ -129,7 +129,7 @@ - - /* Allocate a hardware channel. */ - ret = nouveau_channel_alloc(context_dev(ctx), 0xbeef0201, 0xbeef0202, -- &nctx->hw.chan); -+ 512*1024, &nctx->hw.chan); - if (ret) { - nouveau_error("Error initializing the FIFO.\n"); - return GL_FALSE; -Nur in b/src/mesa/drivers/dri/nouveau: nouveau_context.c.orig. -diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_surface.c b/src/mesa/drivers/dri/nouveau/nouveau_surface.c ---- a/src/mesa/drivers/dri/nouveau/nouveau_surface.c 2010-04-27 23:41:21.000000000 +0200 -+++ b/src/mesa/drivers/dri/nouveau/nouveau_surface.c 2010-12-11 18:09:19.750000046 +0100 -@@ -34,8 +34,8 @@ - unsigned flags, unsigned format, - unsigned width, unsigned height) - { -- unsigned tile_mode, cpp = _mesa_get_format_bytes(format); -- int ret; -+ unsigned tile_mode = 0, tile_flags = 0; -+ int ret, cpp = _mesa_get_format_bytes(format); - - nouveau_bo_ref(NULL, &s->bo); - -@@ -51,13 +51,21 @@ - if (layout == TILED) { - s->pitch = align(s->pitch, 256); - tile_mode = s->pitch; -+ -+ if (cpp == 4) -+ tile_flags = NOUVEAU_BO_TILE_32BPP; -+ else if (cpp == 2) -+ tile_flags = NOUVEAU_BO_TILE_16BPP; -+ -+ if (_mesa_get_format_bits(format, GL_DEPTH_BITS)) -+ tile_flags |= NOUVEAU_BO_TILE_ZETA; -+ - } else { - s->pitch = align(s->pitch, 64); -- tile_mode = 0; - } - - ret = nouveau_bo_new_tile(context_dev(ctx), flags, 0, s->pitch * height, -- tile_mode, 0, &s->bo); -+ tile_mode, tile_flags, &s->bo); - assert(!ret); - } - -diff -ur a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c ---- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c 2010-10-05 03:58:00.000000000 +0200 -+++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c 2010-12-11 18:18:20.528000045 +0100 -@@ -32,7 +32,7 @@ - - /* Arbitrary pushbuf length we can assume we can get with a single - * WAIT_RING. */ --#define PUSHBUF_DWORDS 2048 -+#define PUSHBUF_DWORDS 65536 - - /* Functions to set up struct nouveau_array_state from something like - * a GL array or index buffer. */ -diff -ur a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c ---- a/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2010-10-05 03:58:00.000000000 +0200 -+++ b/src/mesa/drivers/dri/nouveau/nv10_state_fb.c 2010-12-11 18:15:17.756000046 +0100 -@@ -64,8 +64,8 @@ - - if (!nfb->lma_bo || nfb->lma_bo->size != size) { - nouveau_bo_ref(NULL, &nfb->lma_bo); -- nouveau_bo_new(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size, -- &nfb->lma_bo); -+ nouveau_bo_new_tile(context_dev(ctx), NOUVEAU_BO_VRAM, 0, size, -+ 0, NOUVEAU_BO_TILE_ZETA, &nfb->lma_bo); - } - - nouveau_bo_markl(bctx, celsius, NV17TCL_LMA_DEPTH_BUFFER_OFFSET, |