[arch-commits] Commit in lib32-mesa/trunk (4 files)
Laurent Carlier
lcarlier at archlinux.org
Mon Sep 5 18:59:36 UTC 2016
Date: Monday, September 5, 2016 @ 18:59:36
Author: lcarlier
Revision: 188596
upgpkg: lib32-mesa 12.0.2-1
upstream update 12.0.2
Modified:
lib32-mesa/trunk/PKGBUILD
Deleted:
lib32-mesa/trunk/0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch
lib32-mesa/trunk/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch
lib32-mesa/trunk/0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch
-----------------------------------------------------------+
0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch | 17 --
0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch | 76 ------------
0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch | 38 ------
PKGBUILD | 22 ---
4 files changed, 5 insertions(+), 148 deletions(-)
Deleted: 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch
===================================================================
--- 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch 2016-09-05 18:10:31 UTC (rev 188595)
+++ 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch 2016-09-05 18:59:36 UTC (rev 188596)
@@ -1,17 +0,0 @@
-diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
-index 7564119..38e2c4a 100644
---- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
-+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
-@@ -6058,7 +6058,11 @@ st_translate_program(
- inputSemanticName[i], inputSemanticIndex[i],
- interpMode[i], 0, interpLocation[i],
- array_id, array_size);
-- i += array_size - 1;
-+
-+ GLuint base_attr = inputSlotToAttr[i];
-+ while (i + 1 < numInputs &&
-+ inputSlotToAttr[i + 1] < base_attr + array_size)
-+ ++i;
- }
- else {
- t->inputs[i] = ureg_DECL_fs_input_cyl_centroid(ureg,
Deleted: 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch
===================================================================
--- 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch 2016-09-05 18:10:31 UTC (rev 188595)
+++ 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch 2016-09-05 18:59:36 UTC (rev 188596)
@@ -1,76 +0,0 @@
-From 9ce52baf7f479d506bcea17a371dcf2fad92f139 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig at amd.com>
-Date: Wed, 13 Jul 2016 14:54:31 +0200
-Subject: [PATCH] st/mesa: fix reference counting bug in st_vdpau
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Otherwise we leak the resources created for the DMA-buf descriptors.
-
-Signed-off-by: Christian König <christian.koenig at amd.com>
-Cc: 12.0 <mesa-stable at lists.freedesktop.org>
-Tested-and-Reviewed by: Leo Liu <leo.liu at amd.com>
-Ack-by: Tom St Denis <tom.stdenis at amd.com>
----
- src/mesa/state_tracker/st_vdpau.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/mesa/state_tracker/st_vdpau.c b/src/mesa/state_tracker/st_vdpau.c
-index dffa52f..4f599dd 100644
---- a/src/mesa/state_tracker/st_vdpau.c
-+++ b/src/mesa/state_tracker/st_vdpau.c
-@@ -65,6 +65,7 @@ st_vdpau_video_surface_gallium(struct gl_context *ctx, const void *vdpSurface,
-
- struct pipe_video_buffer *buffer;
- struct pipe_sampler_view **samplers;
-+ struct pipe_resource *res = NULL;
-
- getProcAddr = (void *)ctx->vdpGetProcAddress;
- if (getProcAddr(device, VDP_FUNC_ID_VIDEO_SURFACE_GALLIUM, (void**)&f))
-@@ -82,7 +83,8 @@ st_vdpau_video_surface_gallium(struct gl_context *ctx, const void *vdpSurface,
- if (!sv)
- return NULL;
-
-- return sv->texture;
-+ pipe_resource_reference(&res, sv->texture);
-+ return res;
- }
-
- static struct pipe_resource *
-@@ -90,13 +92,15 @@ st_vdpau_output_surface_gallium(struct gl_context *ctx, const void *vdpSurface)
- {
- int (*getProcAddr)(uint32_t device, uint32_t id, void **ptr);
- uint32_t device = (uintptr_t)ctx->vdpDevice;
-+ struct pipe_resource *res = NULL;
- VdpOutputSurfaceGallium *f;
-
- getProcAddr = (void *)ctx->vdpGetProcAddress;
- if (getProcAddr(device, VDP_FUNC_ID_OUTPUT_SURFACE_GALLIUM, (void**)&f))
- return NULL;
-
-- return f((uintptr_t)vdpSurface);
-+ pipe_resource_reference(&res, f((uintptr_t)vdpSurface));
-+ return res;
- }
-
- static struct pipe_resource *
-@@ -208,6 +212,7 @@ st_vdpau_map_surface(struct gl_context *ctx, GLenum target, GLenum access,
- /* do we have different screen objects ? */
- if (res->screen != st->pipe->screen) {
- _mesa_error(ctx, GL_INVALID_OPERATION, "VDPAUMapSurfacesNV");
-+ pipe_resource_reference(&res, NULL);
- return;
- }
-
-@@ -241,6 +246,7 @@ st_vdpau_map_surface(struct gl_context *ctx, GLenum target, GLenum access,
- stObj->surface_format = res->format;
-
- _mesa_dirty_texobj(ctx, texObj);
-+ pipe_resource_reference(&res, NULL);
- }
-
- static void
---
-2.9.0
-
Deleted: 0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch
===================================================================
--- 0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch 2016-09-05 18:10:31 UTC (rev 188595)
+++ 0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch 2016-09-05 18:59:36 UTC (rev 188596)
@@ -1,38 +0,0 @@
-From 134d6e4e4f980d738361bfcae1daedb8cc58b5df Mon Sep 17 00:00:00 2001
-From: Leo Liu <leo.liu at amd.com>
-Date: Thu, 14 Jul 2016 09:19:59 -0400
-Subject: [PATCH] vl/dri3: fix a memory leak from front buffer
-
-Inspired by fix for mem leak of vdpau interop, resource_from_handle
-set texture reference count, that need to be decreased and released,
-recall there is a similar case for DRI3, that is with VA-API glx
-extension, there is temporary TFP(texture from pixmap), we target it
-through dma-buf. leak happens when without count down the reference.
-
-Checked and found with mpv vo=opengl case, there only one static TFP,
-the leak happens once, but for totem player using gstreamer VA-API glx,
-the dynamic TFP for each frame, so leak quite a bit.
-
-This fixes mem leak for mpv and totem.
-
-Signed-off-by: Leo Liu <leo.liu at amd.com>
-Cc: "12.0" <mesa-stable at lists.freedesktop.org>
----
- src/gallium/auxiliary/vl/vl_winsys_dri3.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri3.c b/src/gallium/auxiliary/vl/vl_winsys_dri3.c
-index f7f572e..493e645 100644
---- a/src/gallium/auxiliary/vl/vl_winsys_dri3.c
-+++ b/src/gallium/auxiliary/vl/vl_winsys_dri3.c
-@@ -89,6 +89,7 @@ dri3_free_front_buffer(struct vl_dri3_screen *scrn,
- {
- xcb_sync_destroy_fence(scrn->conn, buffer->sync_fence);
- xshmfence_unmap_shm(buffer->shm_fence);
-+ pipe_resource_reference(&buffer->texture, NULL);
- FREE(buffer);
- }
-
---
-2.9.0
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-09-05 18:10:31 UTC (rev 188595)
+++ PKGBUILD 2016-09-05 18:59:36 UTC (rev 188596)
@@ -4,8 +4,8 @@
pkgbase=lib32-mesa
pkgname=('lib32-mesa-vdpau' 'lib32-mesa' 'lib32-mesa-libgl')
-pkgver=12.0.1
-pkgrel=5
+pkgver=12.0.2
+pkgrel=1
arch=('x86_64')
makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-llvm' 'lib32-systemd'
@@ -14,17 +14,11 @@
license=('custom')
source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz{,.sig}
LICENSE
- remove-libpthread-stubs.patch
- 0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch
- 0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch
- 0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch)
-sha256sums=('bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389'
+ remove-libpthread-stubs.patch)
+sha256sums=('d957a5cc371dcd7ff2aa0d87492f263aece46f79352f4520039b58b1f32552cb'
'SKIP'
'7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
- 'd82c329e89754266eb1538df29b94d33692a66e3b6882b2cee78f4d5aab4a39c'
- 'ccc8ea7f4e38f2dc26fd29150929e943aac5bc9b56bd3eddec882c6ccd1d64a5'
- 'f6c17257e96182ce51b85ef75cef4f6c205b00dfbf8fc1089cd77c4a3eda6981'
- 'c1b650d2b3512d5f8f463f1974a28ed6b88e7e1936c5cfe1034ab97696d1de14')
+ 'd82c329e89754266eb1538df29b94d33692a66e3b6882b2cee78f4d5aab4a39c')
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov at gmail.com>
prepare() {
@@ -33,12 +27,6 @@
# Now mesa checks for libpthread-stubs - so remove the check
patch -Np1 -i ../remove-libpthread-stubs.patch
- # fix memory leaks - merged upstream
- patch -Np1 -i ../0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch
- patch -Np1 -i ../0002-vl-dri3-fix-a-memory-leak-from-front-buffer.patch
- # fix rendering in overlord series games
- patch -Np1 -i ../0001-Mesa-dev-st_glsl_to_tgsi-overlord-fix.patch
-
autoreconf -fiv
}
More information about the arch-commits
mailing list