drisw: don't leak the winsys
if a winsys is allocated by the frontend, it should be freed by the frontend rather than the driver to ensure it doesn't leak if it doesn't reach the driver cc: mesa-stable Reviewed-by: Jesse Natalie <jenatali@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22396>
This commit is contained in:
committed by
Marge Bot
parent
2d6527c9f1
commit
1e6e3427f0
@@ -382,6 +382,7 @@ pipe_loader_sw_release(struct pipe_loader_device **dev)
|
||||
UNUSED struct pipe_loader_sw_device *sdev =
|
||||
pipe_loader_sw_device(*dev);
|
||||
|
||||
sdev->ws->destroy(sdev->ws);
|
||||
#ifndef GALLIUM_STATIC_TARGETS
|
||||
if (sdev->lib)
|
||||
util_dl_close(sdev->lib);
|
||||
|
||||
@@ -860,7 +860,6 @@ static void
|
||||
llvmpipe_destroy_screen(struct pipe_screen *_screen)
|
||||
{
|
||||
struct llvmpipe_screen *screen = llvmpipe_screen(_screen);
|
||||
struct sw_winsys *winsys = screen->winsys;
|
||||
|
||||
if (screen->cs_tpool)
|
||||
lp_cs_tpool_destroy(screen->cs_tpool);
|
||||
@@ -871,8 +870,6 @@ llvmpipe_destroy_screen(struct pipe_screen *_screen)
|
||||
lp_jit_screen_cleanup(screen);
|
||||
|
||||
disk_cache_destroy(screen->disk_shader_cache);
|
||||
if (winsys->destroy)
|
||||
winsys->destroy(winsys);
|
||||
|
||||
glsl_type_singleton_decref();
|
||||
|
||||
|
||||
@@ -490,12 +490,6 @@ softpipe_is_format_supported( struct pipe_screen *screen,
|
||||
static void
|
||||
softpipe_destroy_screen( struct pipe_screen *screen )
|
||||
{
|
||||
struct softpipe_screen *sp_screen = softpipe_screen(screen);
|
||||
struct sw_winsys *winsys = sp_screen->winsys;
|
||||
|
||||
if(winsys->destroy)
|
||||
winsys->destroy(winsys);
|
||||
|
||||
FREE(screen);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user