diff options
author | root <root@rshg054.dnsready.net> | 2012-10-10 00:43:13 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-10-10 00:43:13 -0700 |
commit | 769ba4645df3c2f793bc2d3ee245573b79b206d3 (patch) | |
tree | 13e34d51217ced7053937eb57c7e12664fd881b5 /testing/mesa | |
parent | 26bcb2409416374f6728bd9b863e4fd147adccb3 (diff) |
Wed Oct 10 00:43:09 PDT 2012
Diffstat (limited to 'testing/mesa')
-rw-r--r-- | testing/mesa/PKGBUILD | 18 | ||||
-rw-r--r-- | testing/mesa/git_fixes.diff | 93 |
2 files changed, 104 insertions, 7 deletions
diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD index d4516ea73..22bb0c339 100644 --- a/testing/mesa/PKGBUILD +++ b/testing/mesa/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 168203 2012-10-06 20:05:41Z andyrtr $ +# $Id: PKGBUILD 168375 2012-10-09 16:09:24Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri') -_git=true -_gitdate=20121006 -#_git=false +#_git=true +#_gitdate=20121006 +_git=false if [ "${_git}" = "true" ]; then pkgver=8.99.git_$_gitdate else - pkgver=8.0.4 + pkgver=9.0 fi pkgrel=1 arch=('i686' 'x86_64') @@ -21,7 +21,8 @@ makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage> url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') -source=(LICENSE) +source=(LICENSE + git_fixes.diff) if [ "${_git}" = "true" ]; then # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0 #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz') @@ -32,11 +33,14 @@ if [ "${_git}" = "true" ]; then ) fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '87039abd49bc7ada45f98cf752b9f45b') + '2ebce12196dbb7b69bdf7ef53b8afdee' + '60e557ce407be3732711da484ab3db6c') build() { cd ${srcdir}/?esa-* + patch -Np1 -i ${srcdir}/git_fixes.diff + COMMONOPTS="--prefix=/usr \ --sysconfdir=/etc \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ diff --git a/testing/mesa/git_fixes.diff b/testing/mesa/git_fixes.diff new file mode 100644 index 000000000..8132d1d10 --- /dev/null +++ b/testing/mesa/git_fixes.diff @@ -0,0 +1,93 @@ +From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001 +From: Ian Romanick <ian.d.romanick@intel.com> +Date: Mon, 08 Oct 2012 22:07:10 +0000 +Subject: docs: Add 9.0 release md5sums + +Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> +--- +diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html +index d72c5bb..02b7324 100644 +--- a/docs/relnotes-9.0.html ++++ b/docs/relnotes-9.0.html +@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported. + + <h2>MD5 checksums</h2> + <pre> +-tbd ++be4cd34c6599a7cb9d254b05c48bdb1f MesaLib-9.0.tar.gz ++60e557ce407be3732711da484ab3db6c MesaLib-9.0.tar.bz2 ++16b128544cd3f7e237927bb9f8aab7ce MesaLib-9.0.zip + </pre> + + +-- +cgit v0.9.0.2-2-gbebe +From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001 +From: Brian Paul <brianp@vmware.com> +Date: Fri, 05 Oct 2012 22:47:40 +0000 +Subject: mesa: don't call TexImage driver hooks for zero-sized images + +This simply avoids some failed assertions but there's no reason to +call the driver hooks for storing a tex image if its size is zero. + +Note: This is a candidate for the stable branches. +(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d) +--- +diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c +index 21646cc..8004876 100644 +--- a/src/mesa/main/teximage.c ++++ b/src/mesa/main/teximage.c +@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims, + border, internalFormat, texFormat); + + /* Give the texture to the driver. <pixels> may be null. */ +- if (compressed) { +- ctx->Driver.CompressedTexImage(ctx, dims, texImage, +- imageSize, pixels); +- } +- else { +- ctx->Driver.TexImage(ctx, dims, texImage, format, +- type, pixels, unpack); ++ if (width > 0 && height > 0 && depth > 0) { ++ if (compressed) { ++ ctx->Driver.CompressedTexImage(ctx, dims, texImage, ++ imageSize, pixels); ++ } ++ else { ++ ctx->Driver.TexImage(ctx, dims, texImage, format, ++ type, pixels, unpack); ++ } + } + + check_gen_mipmap(ctx, target, texObj, level); +-- +cgit v0.9.0.2-2-gbebe +From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001 +From: Brian Paul <brianp@vmware.com> +Date: Fri, 05 Oct 2012 22:59:27 +0000 +Subject: mesa: fix error check for zero-sized compressed subtexture + +For glCompressedTexSubImage, width or height = 0 is legal. +Fixes a failure in piglit's s3tc-errors test. + +This is for the 9.0 and 8.0 branches. Already fixed on master. +--- +diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c +index 8004876..38fa9fa 100644 +--- a/src/mesa/main/teximage.c ++++ b/src/mesa/main/teximage.c +@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions, + if (!_mesa_is_compressed_format(ctx, format)) + return GL_INVALID_ENUM; + +- if (width < 1 || width > maxTextureSize) ++ if (width < 0 || width > maxTextureSize) + return GL_INVALID_VALUE; + +- if ((height < 1 || height > maxTextureSize) ++ if ((height < 0 || height > maxTextureSize) + && dimensions > 1) + return GL_INVALID_VALUE; + +-- +cgit v0.9.0.2-2-gbebe |