Mesa (staging/18.2): v3d: Fix a leak of the transfer helper on screen destroy.

[GitLab Mirror]

Module: Mesa
Branch: staging/18.2
Commit: 47850ced2e10c48ac51abf9301b7ed8e8a68798c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=47850ced2e10c48ac51abf9301b7ed8e8a68798c

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Dec  7 10:30:09 2018 -0800

v3d: Fix a leak of the transfer helper on screen destroy.

Fixes: 7a30517cce8f ("broadcom/vc5: Start adding support for rendering to Z32F_S8X24_UINT.")
(cherry picked from commit 3bd73d31a862fd1e198a7c83ec656a4a376c593a)
[Juan A. Suarez: resolve trivial conflicts]
Signed-off-by: Juan A. Suarez Romero <jasuarez at igalia.com>

Conflicts:
	src/gallium/drivers/v3d/v3d_screen.c

---

 src/gallium/drivers/v3d/v3d_screen.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/v3d/v3d_screen.c b/src/gallium/drivers/v3d/v3d_screen.c
index 2f084792e6..e826ba6a45 100644
--- a/src/gallium/drivers/v3d/v3d_screen.c
+++ b/src/gallium/drivers/v3d/v3d_screen.c
@@ -31,6 +31,7 @@
 #include "util/u_memory.h"
 #include "util/u_format.h"
 #include "util/u_hash_table.h"
+#include "util/u_transfer_helper.h"
 #include "util/ralloc.h"
 
 #include <xf86drm.h>
@@ -73,6 +74,7 @@ v3d_screen_destroy(struct pipe_screen *pscreen)
                 v3d_simulator_destroy(screen);
 
         v3d_compiler_free(screen->compiler);
+        u_transfer_helper_destroy(pscreen->transfer_helper);
 
         close(screen->fd);
         ralloc_free(pscreen);