Module: Mesa Branch: staging/18.2 Commit: 8508ce011368adc5001ae522daf50d744cf2a25e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8508ce011368adc5001ae522daf50d744cf2a25e
Author: Eric Anholt <[email protected]> Date: Fri Dec 7 10:31:27 2018 -0800 vc4: Fix a leak of the transfer helper on screen destroy. Fixes: d009463a6549 ("vc4: Switch to using u_transfer_helper for MSAA maps.") (cherry picked from commit 7f8d8b7d27868037a146f7fca04fef56b29bb85e) [Juan A. Suarez: resolve trivial conflicts] Signed-off-by: Juan A. Suarez Romero <[email protected]> Conflicts: src/gallium/drivers/vc4/vc4_screen.c --- src/gallium/drivers/vc4/vc4_screen.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c index 646e7fa723..1709cf383c 100644 --- a/src/gallium/drivers/vc4/vc4_screen.c +++ b/src/gallium/drivers/vc4/vc4_screen.c @@ -32,6 +32,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> @@ -109,6 +110,8 @@ vc4_screen_destroy(struct pipe_screen *pscreen) vc4_simulator_destroy(screen); #endif + u_transfer_helper_destroy(pscreen->transfer_helper); + close(screen->fd); ralloc_free(pscreen); } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
