From 141109cc529b3a5d71c0023ad5c19c8844c05171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 9 Oct 2015 00:54:17 +0200 Subject: [PATCH] radeonsi: fix a GS copy shader leak MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Michel Dänzer (cherry picked from commit aa060e276c203baf4691d4a4722accd5bdbb8526) [Emil Velikov: si_shader_destroy() wants the ctx as first argument] Signed-off-by: Emil Velikov Conflicts: src/gallium/drivers/radeonsi/si_shader.c --- src/gallium/drivers/radeonsi/si_shader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 1010b6e2491..ef986bd2e6c 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -4201,8 +4201,10 @@ out: void si_shader_destroy(struct pipe_context *ctx, struct si_shader *shader) { - if (shader->gs_copy_shader) + if (shader->gs_copy_shader) { si_shader_destroy(ctx, shader->gs_copy_shader); + FREE(shader->gs_copy_shader); + } if (shader->scratch_bo) r600_resource_reference(&shader->scratch_bo, NULL);