From c88d795734963f1a9a5ab29c9d84e550c766eee0 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 5 Dec 2015 10:33:50 +0100
Subject: [PATCH] Start using font driver wrapper functions

---
 gfx/d3d/d3d.cpp          |  1 -
 gfx/drivers/vita2d_gfx.c | 13 +++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index a8b18d084d..16dcac928c 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -1433,7 +1433,6 @@ static bool d3d_frame(void *data, const void *frame,
    driver_t *driver                    = driver_get_ptr();
    settings_t *settings                = config_get_ptr();
    HWND window                         = win32_get_window();
-   const font_renderer_t *font_ctx     = driver->font_osd_driver;
 
    (void)i;
 
diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c
index 942c2cc712..dbcb9fc22b 100644
--- a/gfx/drivers/vita2d_gfx.c
+++ b/gfx/drivers/vita2d_gfx.c
@@ -132,10 +132,9 @@ static void *vita2d_gfx_init(const video_info_t *video,
    vita->keep_aspect        = true;
    vita->should_resize      = true;
 #ifdef HAVE_OVERLAY
-   vita->overlay_enable           = false;
+   vita->overlay_enable     = false;
 #endif
-   if (!font_init_first((const void**)&driver->font_osd_driver, &driver->font_osd_data,
-          vita, *settings->video.font_path 
+   if (!font_driver_init_first(vita, *settings->video.font_path 
           ? settings->video.font_path : NULL, settings->video.font_size,
           FONT_DRIVER_RENDER_VITA2D))
    {
@@ -279,13 +278,7 @@ static bool vita2d_gfx_frame(void *data, const void *frame,
    }
    
    if(msg && strcmp(msg,""))
-   {
-     driver_t          *driver = driver_get_ptr();
-     const font_renderer_t *font_ctx = driver->font_osd_driver;
-     
-     if (font_ctx->render_msg)
-       font_ctx->render_msg(driver->font_osd_data, msg, NULL);
-   }
+     font_driver_render_msg(msg, NULL);
    
    vita2d_end_drawing();
    vita2d_swap_buffers();