From 275814e29198ebd44447508526042023df0c167d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 20 Oct 2016 00:39:33 +0200 Subject: [PATCH] Replace font_driver_free(NULL) calls with font_driver_free_osd() inside video drivers --- gfx/drivers/d3d.cpp | 3 ++- gfx/drivers/vita2d_gfx.c | 4 +--- gfx/drivers/vulkan.c | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gfx/drivers/d3d.cpp b/gfx/drivers/d3d.cpp index a88282bf5c..650332738d 100644 --- a/gfx/drivers/d3d.cpp +++ b/gfx/drivers/d3d.cpp @@ -487,7 +487,8 @@ static void d3d_deinitialize(d3d_video_t *d3d) if (!d3d) return; - font_driver_free(NULL); + font_driver_free_osd(); + d3d_deinit_chain(d3d); } diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c index 8f2fdeaae3..cb10df5891 100644 --- a/gfx/drivers/vita2d_gfx.c +++ b/gfx/drivers/vita2d_gfx.c @@ -318,9 +318,7 @@ static void vita2d_gfx_free(void *data) vita->texture = NULL; } - font_driver_free(NULL); - - RARCH_LOG("vita2d_gfx_free() done\n"); + font_driver_free_osd(); } static bool vita2d_gfx_set_shader(void *data, diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c index 42524787bc..c45e3acf7b 100644 --- a/gfx/drivers/vulkan.c +++ b/gfx/drivers/vulkan.c @@ -846,7 +846,8 @@ static void vulkan_free(void *data) /* No need to init this since textures are create on-demand. */ vulkan_deinit_menu(vk); - font_driver_free(NULL); + + font_driver_free_osd(); vulkan_deinit_static_resources(vk); vulkan_overlay_free(vk);