From 1340c6e3954723bc24b3d31b6e37fd83ed9b2ad0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 8 Sep 2016 00:04:55 -0300 Subject: lib32-opencl-mesa-12.0.2-1: updating version --- ...sa-fix-reference-counting-bug-in-st_vdpau.patch | 76 ---------------------- 1 file changed, 76 deletions(-) delete mode 100644 libre-multilib/lib32-opencl-mesa/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch (limited to 'libre-multilib/lib32-opencl-mesa/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch') diff --git a/libre-multilib/lib32-opencl-mesa/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch b/libre-multilib/lib32-opencl-mesa/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch deleted file mode 100644 index 3f2391dbc..000000000 --- a/libre-multilib/lib32-opencl-mesa/0001-st-mesa-fix-reference-counting-bug-in-st_vdpau.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 9ce52baf7f479d506bcea17a371dcf2fad92f139 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Christian=20K=C3=B6nig?= -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 -Cc: 12.0 -Tested-and-Reviewed by: Leo Liu -Ack-by: Tom St Denis ---- - 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 - -- cgit v1.2.3-54-g00ecf