From bf9afe6e9077e0334569ab394f879cc05204ca33 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 22 Feb 2015 10:37:58 +0100 Subject: [PATCH] Mesa: update to Mesa-10.4.5 Signed-off-by: Stephan Raue --- packages/graphics/Mesa/package.mk | 2 +- ...Mesa-1004-fix-performance-regression.patch | 22 ------------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 packages/graphics/Mesa/patches/Mesa-1004-fix-performance-regression.patch diff --git a/packages/graphics/Mesa/package.mk b/packages/graphics/Mesa/package.mk index 0a837d42e7..ac2d107b58 100644 --- a/packages/graphics/Mesa/package.mk +++ b/packages/graphics/Mesa/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="Mesa" -PKG_VERSION="10.4.4" +PKG_VERSION="10.4.5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/graphics/Mesa/patches/Mesa-1004-fix-performance-regression.patch b/packages/graphics/Mesa/patches/Mesa-1004-fix-performance-regression.patch deleted file mode 100644 index 0dc4e2e7ac..0000000000 --- a/packages/graphics/Mesa/patches/Mesa-1004-fix-performance-regression.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c -index 55f3644..d68e1e9 100644 ---- a/src/mesa/state_tracker/st_cb_bufferobjects.c -+++ b/src/mesa/state_tracker/st_cb_bufferobjects.c -@@ -256,8 +256,15 @@ st_bufferobj_data(struct gl_context *ctx, - break; - case GL_STREAM_DRAW: - case GL_STREAM_COPY: -- pipe_usage = PIPE_USAGE_STREAM; -- break; -+ /* XXX: Remove this test when we have PBO unpack acceleration. Right -+ * now, PBO unpacking is done by the CPU, so we have to make sure -+ * CPU reads are fast. -+ */ -+ if (target != GL_PIXEL_UNPACK_BUFFER_ARB) { -+ pipe_usage = PIPE_USAGE_STREAM; -+ break; -+ } -+ /* fall through */ - case GL_STATIC_READ: - case GL_DYNAMIC_READ: - case GL_STREAM_READ: