diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c
index 3e285682be..0438db00f0 100644
--- a/gfx/drivers/ctr_gfx.c
+++ b/gfx/drivers/ctr_gfx.c
@@ -498,27 +498,13 @@ static void ctr_font_render_message(
    float line_height;
    struct font_line_metrics *line_metrics = NULL;
    int lines                              = 0;
-
-   if (!msg || !*msg)
-      return;
-
-   /* If font line metrics are not supported just draw as usual */
-   if (!font->font_driver->get_line_metrics(font->font_data, &line_metrics))
-   {
-      size_t msg_len = strlen(msg);
-      ctr_font_render_line(ctr, font, msg, msg_len,
-                           scale, color, pos_x, pos_y,
-                           width, height, text_align);
-      return;
-   }
-
+   font->font_driver->get_line_metrics(font->font_data, &line_metrics);
    line_height = (float)line_metrics->height * scale / (float)height;
 
    for (;;)
    {
       const char* delim = strchr(msg, '\n');
-      size_t msg_len    = delim ?
-         (delim - msg) : strlen(msg);
+      size_t msg_len    = delim ? (delim - msg) : strlen(msg);
 
       /* Draw the line */
       ctr_font_render_line(ctr, font, msg, msg_len,
@@ -626,7 +612,10 @@ static bool ctr_font_get_line_metrics(void* data, struct font_line_metrics **met
 {
    ctr_font_t* font = (ctr_font_t*)data;
    if (font && font->font_driver && font->font_data)
-      return font->font_driver->get_line_metrics(font->font_data, metrics);
+   {
+      font->font_driver->get_line_metrics(font->font_data, metrics);
+      return true;
+   }
    return false;
 }
 
diff --git a/gfx/drivers/d3d10.c b/gfx/drivers/d3d10.c
index 9c8333be6f..8f7544d7b4 100644
--- a/gfx/drivers/d3d10.c
+++ b/gfx/drivers/d3d10.c
@@ -782,30 +782,13 @@ static void d3d10_font_render_message(
    struct font_line_metrics *line_metrics = NULL;
    int lines                              = 0;
    float line_height;
-
-   if (!msg || !*msg)
-      return;
-   if (!d3d10 || (!(d3d10->flags & D3D10_ST_FLAG_SPRITES_ENABLE)))
-      return;
-
-   /* If font line metrics are not supported just draw as usual */
-   if (!font->font_driver->get_line_metrics(font->font_data, &line_metrics))
-   {
-      size_t msg_len = strlen(msg);
-      if (msg_len <= (unsigned)d3d10->sprites.capacity)
-         d3d10_font_render_line(d3d10,
-               font, msg, msg_len, scale, color, pos_x, pos_y,
-               width, height, text_align);
-      return;
-   }
-
+   font->font_driver->get_line_metrics(font->font_data, &line_metrics);
    line_height = line_metrics->height * scale / height;
 
    for (;;)
    {
       const char* delim = strchr(msg, '\n');
-      size_t msg_len  = delim ?
-         (delim - msg) : strlen(msg);
+      size_t msg_len  = delim ? (delim - msg) : strlen(msg);
 
       /* Draw the line */
       if (msg_len <= (unsigned)d3d10->sprites.capacity)
@@ -839,6 +822,8 @@ static void d3d10_font_render_msg(
 
    if (!font || !msg || !*msg)
       return;
+   if (!d3d10 || (!(d3d10->flags & D3D10_ST_FLAG_SPRITES_ENABLE)))
+      return;
 
    if (params)
    {
@@ -915,7 +900,10 @@ static bool d3d10_font_get_line_metrics(void* data, struct font_line_metrics **m
 {
    d3d10_font_t* font = (d3d10_font_t*)data;
    if (font && font->font_driver && font->font_data)
-      return font->font_driver->get_line_metrics(font->font_data, metrics);
+   {
+      font->font_driver->get_line_metrics(font->font_data, metrics);
+      return true;
+   }
    return false;
 }
 
diff --git a/gfx/drivers/d3d11.c b/gfx/drivers/d3d11.c
index 1217327a8d..b36e6be04a 100644
--- a/gfx/drivers/d3d11.c
+++ b/gfx/drivers/d3d11.c
@@ -838,29 +838,13 @@ static void d3d11_font_render_message(
    struct font_line_metrics *line_metrics = NULL;
    int lines                              = 0;
 
-   if (!msg || !*msg)
-      return;
-   if (!(d3d11->flags & D3D11_ST_FLAG_SPRITES_ENABLE))
-      return;
-
-   /* If font line metrics are not supported just draw as usual */
-   if (!font->font_driver->get_line_metrics(font->font_data, &line_metrics))
-   {
-      size_t msg_len = strlen(msg);
-      if (msg_len <= (unsigned)d3d11->sprites.capacity)
-         d3d11_font_render_line(d3d11,
-               font, msg, msg_len, scale, color, pos_x, pos_y,
-               width, height, text_align);
-      return;
-   }
-
+   font->font_driver->get_line_metrics(font->font_data, &line_metrics);
    line_height = line_metrics->height * scale / height;
 
    for (;;)
    {
       const char* delim = strchr(msg, '\n');
-      size_t msg_len    = delim ?
-         (delim - msg) : strlen(msg);
+      size_t msg_len    = delim ? (delim - msg) : strlen(msg);
 
       /* Draw the line */
       if (msg_len <= (unsigned)d3d11->sprites.capacity)
@@ -894,6 +878,8 @@ static void d3d11_font_render_msg(
 
    if (!font || !msg || !*msg)
       return;
+   if (!(d3d11->flags & D3D11_ST_FLAG_SPRITES_ENABLE))
+      return;
 
    if (params)
    {
@@ -946,11 +932,12 @@ static void d3d11_font_render_msg(
       unsigned alpha_dark     = alpha * drop_alpha;
       unsigned color_dark     = DXGI_COLOR_RGBA(r_dark, g_dark, b_dark, alpha_dark);
 
-      d3d11_font_render_message(d3d11,
-            font, msg, scale, color_dark,
-            x + scale * drop_x / width,
-            y + scale * drop_y / height,
-            width, height, text_align);
+      if (d3d11->flags & D3D11_ST_FLAG_SPRITES_ENABLE)
+         d3d11_font_render_message(d3d11,
+               font, msg, scale, color_dark,
+               x + scale * drop_x / width,
+               y + scale * drop_y / height,
+               width, height, text_align);
    }
 
    d3d11_font_render_message(d3d11, font, msg, scale,
@@ -969,7 +956,10 @@ static bool d3d11_font_get_line_metrics(void* data, struct font_line_metrics **m
 {
    d3d11_font_t* font = (d3d11_font_t*)data;
    if (font && font->font_driver && font->font_data)
-      return font->font_driver->get_line_metrics(font->font_data, metrics);
+   {
+      font->font_driver->get_line_metrics(font->font_data, metrics);
+      return true;
+   }
    return false;
 }
 
diff --git a/gfx/drivers/d3d12.c b/gfx/drivers/d3d12.c
index 3c20386403..752aa6aba9 100644
--- a/gfx/drivers/d3d12.c
+++ b/gfx/drivers/d3d12.c
@@ -962,33 +962,16 @@ static void d3d12_font_render_message(
       unsigned            height,
       unsigned            text_align)
 {
+   float line_height;
    struct font_line_metrics *line_metrics = NULL;
    int lines                              = 0;
-   float line_height;
-
-   if (!msg || !*msg)
-      return;
-   if (!d3d12 || (!(d3d12->flags & D3D12_ST_FLAG_SPRITES_ENABLE)))
-      return;
-
-   /* If font line metrics are not supported just draw as usual */
-   if (!font->font_driver->get_line_metrics(font->font_data, &line_metrics))
-   {
-      size_t msg_len = strlen(msg);
-      if (msg_len <= d3d12->sprites.capacity)
-         d3d12_font_render_line(d3d12,
-               font, msg, msg_len,
-               scale, color, pos_x, pos_y, width, height, text_align);
-      return;
-   }
-
+   font->font_driver->get_line_metrics(font->font_data, &line_metrics);
    line_height = line_metrics->height * scale / height;
 
    for (;;)
    {
       const char* delim = strchr(msg, '\n');
-      size_t msg_len    = delim ?
-         (delim - msg) : strlen(msg);
+      size_t msg_len    = delim ? (delim - msg) : strlen(msg);
 
       /* Draw the line */
       if (msg_len <= d3d12->sprites.capacity)
@@ -1021,6 +1004,8 @@ static void d3d12_font_render_msg(
 
    if (!font || !msg || !*msg)
       return;
+   if (!d3d12 || (!(d3d12->flags & D3D12_ST_FLAG_SPRITES_ENABLE)))
+      return;
 
    if (params)
    {
@@ -1097,7 +1082,10 @@ static bool d3d12_font_get_line_metrics(void* data, struct font_line_metrics **m
 {
    d3d12_font_t* font = (d3d12_font_t*)data;
    if (font && font->font_driver && font->font_data)
-      return font->font_driver->get_line_metrics(font->font_data, metrics);
+   {
+      font->font_driver->get_line_metrics(font->font_data, metrics);
+      return true;
+   }
    return false;
 }
 
diff --git a/gfx/drivers/gl1.c b/gfx/drivers/gl1.c
index b6c74afe63..178cc425b0 100644
--- a/gfx/drivers/gl1.c
+++ b/gfx/drivers/gl1.c
@@ -609,26 +609,16 @@ static void gl1_raster_font_render_message(
       const GLfloat color[4], GLfloat pos_x, GLfloat pos_y,
       unsigned text_align)
 {
+   float line_height;
    struct font_line_metrics *line_metrics = NULL;
    int lines                              = 0;
-   float line_height;
-
-   /* If font line metrics are not supported just draw as usual */
-   if (!font->font_driver->get_line_metrics(font->font_data, &line_metrics))
-   {
-      gl1_raster_font_render_line(font->gl, font,
-            msg, strlen(msg), scale, color, pos_x,
-            pos_y, text_align);
-      return;
-   }
-
+   font->font_driver->get_line_metrics(font->font_data, &line_metrics);
    line_height = line_metrics->height * scale / font->gl->vp.height;
 
    for (;;)
    {
       const char *delim = strchr(msg, '\n');
-      size_t msg_len    = delim
-         ? (delim - msg) : strlen(msg);
+      size_t msg_len    = delim ? (delim - msg) : strlen(msg);
 
       /* Draw the line */
       gl1_raster_font_render_line(font->gl, font,
@@ -805,7 +795,10 @@ static bool gl1_raster_font_get_line_metrics(void* data, struct font_line_metric
 {
    gl1_raster_t *font = (gl1_raster_t*)data;
    if (font && font->font_driver && font->font_data)
-      return font->font_driver->get_line_metrics(font->font_data, metrics);
+   {
+      font->font_driver->get_line_metrics(font->font_data, metrics);
+      return true;
+   }
    return false;
 }
 
diff --git a/gfx/drivers/gl2.c b/gfx/drivers/gl2.c
index 51f71877c0..4df6736326 100644
--- a/gfx/drivers/gl2.c
+++ b/gfx/drivers/gl2.c
@@ -919,26 +919,16 @@ static void gl2_raster_font_render_message(
       const GLfloat color[4], GLfloat pos_x, GLfloat pos_y,
       unsigned text_align)
 {
+   float line_height;
    struct font_line_metrics *line_metrics = NULL;
    int lines                              = 0;
-   float line_height;
-
-   /* If font line metrics are not supported just draw as usual */
-   if (!font->font_driver->get_line_metrics(font->font_data, &line_metrics))
-   {
-      gl2_raster_font_render_line(font->gl, font,
-            msg, strlen(msg), scale, color, pos_x,
-            pos_y, text_align);
-      return;
-   }
-
+   font->font_driver->get_line_metrics(font->font_data, &line_metrics);
    line_height = line_metrics->height * scale / font->gl->vp.height;
 
    for (;;)
    {
       const char *delim = strchr(msg, '\n');
-      size_t msg_len    = delim
-         ? (delim - msg) : strlen(msg);
+      size_t msg_len    = delim ? (delim - msg) : strlen(msg);
 
       /* Draw the line */
       gl2_raster_font_render_line(font->gl, font,
@@ -1118,7 +1108,10 @@ static bool gl2_raster_font_get_line_metrics(void* data, struct font_line_metric
 {
    gl2_raster_t *font   = (gl2_raster_t*)data;
    if (font && font->font_driver && font->font_data)
-      return font->font_driver->get_line_metrics(font->font_data, metrics);
+   {
+      font->font_driver->get_line_metrics(font->font_data, metrics);
+      return true;
+   }
    return false;
 }
 
diff --git a/gfx/drivers/gl3.c b/gfx/drivers/gl3.c
index 8ca648fcee..c7a41df1d6 100644
--- a/gfx/drivers/gl3.c
+++ b/gfx/drivers/gl3.c
@@ -651,26 +651,16 @@ static void gl3_raster_font_render_message(
       const GLfloat color[4], GLfloat pos_x, GLfloat pos_y,
       unsigned text_align)
 {
+   float line_height;
    struct font_line_metrics *line_metrics = NULL;
    int lines                              = 0;
-   float line_height;
-
-   /* If font line metrics are not supported just draw as usual */
-   if (!font->font_driver->get_line_metrics(font->font_data, &line_metrics))
-   {
-      gl3_raster_font_render_line(font->gl, font,
-            msg, strlen(msg), scale, color, pos_x,
-            pos_y, text_align);
-      return;
-   }
-
+   font->font_driver->get_line_metrics(font->font_data, &line_metrics);
    line_height = line_metrics->height * scale / font->gl->vp.height;
 
    for (;;)
    {
       const char *delim = strchr(msg, '\n');
-      size_t msg_len    = delim
-         ? (delim - msg) : strlen(msg);
+      size_t msg_len    = delim ? (delim - msg) : strlen(msg);
 
       /* Draw the line */
       gl3_raster_font_render_line(font->gl, font,
@@ -839,7 +829,10 @@ static bool gl3_raster_font_get_line_metrics(void* data, struct font_line_metric
 {
    gl3_raster_t *font   = (gl3_raster_t*)data;
    if (font && font->font_driver && font->font_data)
-      return font->font_driver->get_line_metrics(font->font_data, metrics);
+   {
+      font->font_driver->get_line_metrics(font->font_data, metrics);
+      return true;
+   }
    return false;
 }
 
diff --git a/gfx/drivers/gx2_gfx.c b/gfx/drivers/gx2_gfx.c
index c357c828c6..9d129ea82f 100644
--- a/gfx/drivers/gx2_gfx.c
+++ b/gfx/drivers/gx2_gfx.c
@@ -586,33 +586,16 @@ static void gx2_font_render_message(
       const unsigned int color, float pos_x, float pos_y,
       unsigned width, unsigned height, unsigned text_align)
 {
+   float line_height;
    struct font_line_metrics *line_metrics = NULL;
    int lines                              = 0;
-   float line_height;
-
-   if (!msg || !*msg)
-      return;
-   if (!wiiu)
-      return;
-
-   /* If font line metrics are not supported just draw as usual */
-   if (!font->font_driver->get_line_metrics(font->font_data, &line_metrics))
-   {
-      size_t msg_len = strlen(msg);
-      if (wiiu->vertex_cache.current + (msg_len * 4) <= wiiu->vertex_cache.size) 
-         gx2_font_render_line(wiiu, font, msg, msg_len,
-               scale, color, pos_x, pos_y,
-               width, height, text_align);
-      return;
-   }
-
+   font->font_driver->get_line_metrics(font->font_data, &line_metrics);
    line_height = line_metrics->height * scale / wiiu->vp.height;
 
    for (;;)
    {
       const char* delim = strchr(msg, '\n');
-      size_t msg_len    = delim ? 
-         (delim - msg) : strlen(msg);
+      size_t msg_len    = delim ? (delim - msg) : strlen(msg);
 
       /* Draw the line */
       if (wiiu->vertex_cache.current + (msg_len * 4) <= wiiu->vertex_cache.size) 
@@ -643,7 +626,7 @@ static void gx2_font_render_msg(
    unsigned width             = wiiu->vp.full_width;
    unsigned height            = wiiu->vp.full_height;
 
-   if (!font || !msg || !*msg)
+   if (!font || !wiiu || !msg || !*msg)
       return;
 
    if (params)
@@ -716,7 +699,10 @@ static bool gx2_font_get_line_metrics(void* data, struct font_line_metrics **met
 {
    gx2_font_t* font = (gx2_font_t*)data;
    if (font && font->font_driver && font->font_data)
-      return font->font_driver->get_line_metrics(font->font_data, metrics);
+   {
+      font->font_driver->get_line_metrics(font->font_data, metrics);
+      return true;
+   }
    return false;
 }
 
diff --git a/gfx/drivers/metal.m b/gfx/drivers/metal.m
index 28966a5835..154fb68be1 100644
--- a/gfx/drivers/metal.m
+++ b/gfx/drivers/metal.m
@@ -521,21 +521,13 @@ static INLINE void write_quad6(SpriteVertex *pv,
    int lines = 0;
    float line_height;
    struct font_line_metrics *line_metrics = NULL;
-
-   /* If font line metrics are not supported just draw as usual */
-   if (!_font_driver->get_line_metrics(_font_data, &line_metrics))   
-   {
-      [self _renderLine:msg length:strlen(msg) scale:scale color:color posX:posX posY:posY aligned:aligned];
-      return;
-   }
-
+   _font_driver->get_line_metrics(_font_data, &line_metrics);
    line_height = line_metrics->height * scale / height;
 
    for (;;)
    {
       const char *delim  = strchr(msg, '\n');
-      NSUInteger msg_len = delim ?
-         (unsigned)(delim - msg) : strlen(msg);
+      NSUInteger msg_len = delim ? (unsigned)(delim - msg) : strlen(msg);
 
       /* Draw the line */
       [self _renderLine:msg
diff --git a/gfx/drivers/ps2_gfx.c b/gfx/drivers/ps2_gfx.c
index 486369621f..8cdabf099a 100644
--- a/gfx/drivers/ps2_gfx.c
+++ b/gfx/drivers/ps2_gfx.c
@@ -288,29 +288,16 @@ static void ps2_font_render_message(
       const unsigned int color, float pos_x, float pos_y,
       unsigned width, unsigned height, unsigned text_align)
 {
+   float line_height;
    struct font_line_metrics *line_metrics = NULL;
    int lines                              = 0;
-   float line_height;
-
-   if (!msg || !*msg)
-      return;
-
-   /* If font line metrics are not supported just draw as usual */
-   if (!font->font_driver->get_line_metrics(font->font_data, &line_metrics))
-   {
-      ps2_font_render_line(ps2, font, msg, strlen(msg),
-                           scale, color, pos_x, pos_y,
-                           width, height, text_align);
-      return;
-   }
-
+   font->font_driver->get_line_metrics(font->font_data, &line_metrics);
    line_height = (float)line_metrics->height * scale / (float)height;
 
    for (;;)
    {
       const char* delim = strchr(msg, '\n');
-      size_t msg_len    = delim ?
-         (delim - msg) : strlen(msg);
+      size_t msg_len    = delim ? (delim - msg) : strlen(msg);
 
       /* Draw the line */
       ps2_font_render_line(ps2, font, msg, msg_len,
@@ -417,7 +404,10 @@ static bool ps2_font_get_line_metrics(void* data, struct font_line_metrics **met
 {
    ps2_font_t* font = (ps2_font_t*)data;
    if (font && font->font_driver && font->font_data)
-      return font->font_driver->get_line_metrics(font->font_data, metrics);
+   {
+      font->font_driver->get_line_metrics(font->font_data, metrics);
+      return true;
+   }
    return false;
 }
 
diff --git a/gfx/drivers/rsx_gfx.c b/gfx/drivers/rsx_gfx.c
index 3bbea9fbaf..e38e19372c 100644
--- a/gfx/drivers/rsx_gfx.c
+++ b/gfx/drivers/rsx_gfx.c
@@ -658,23 +658,13 @@ static void rsx_font_render_message(
    struct font_line_metrics *line_metrics = NULL;
    int lines                              = 0;
    float line_height;
-
-   /* If font line metrics are not supported just draw as usual */
-   if (!font->font_driver->get_line_metrics(font->font_data, &line_metrics))
-   {
-      rsx_font_render_line(font,
-            msg, strlen(msg), scale, color, pos_x,
-            pos_y, text_align);
-      return;
-   }
-
+   font->font_driver->get_line_metrics(font->font_data, &line_metrics);
    line_height = line_metrics->height * scale / font->rsx->vp.height;
 
    for (;;)
    {
       const char *delim = strchr(msg, '\n');
-      size_t msg_len    = delim
-         ? (delim - msg) : strlen(msg);
+      size_t msg_len    = delim ? (delim - msg) : strlen(msg);
 
       /* Draw the line */
       rsx_font_render_line(font,
@@ -857,7 +847,10 @@ static bool rsx_font_get_line_metrics(void* data, struct font_line_metrics **met
 {
    rsx_font_t *font = (rsx_font_t*)data;
    if (font && font->font_driver && font->font_data)
-      return font->font_driver->get_line_metrics(font->font_data, metrics);
+   {
+      font->font_driver->get_line_metrics(font->font_data, metrics);
+      return true;
+   }
    return false;
 }
 
diff --git a/gfx/drivers/switch_nx_gfx.c b/gfx/drivers/switch_nx_gfx.c
index aeaf6f7009..2cdd2c23f9 100644
--- a/gfx/drivers/switch_nx_gfx.c
+++ b/gfx/drivers/switch_nx_gfx.c
@@ -251,32 +251,16 @@ static void switch_font_render_message(
       const unsigned int color, float pos_x, float pos_y,
       unsigned text_align)
 {
+   float line_height;
    struct font_line_metrics *line_metrics = NULL;
    int lines                              = 0;
-   float line_height;
-
-   if (!msg || !*msg || !sw)
-      return;
-   if (!sw || !sw->out_buffer)
-      return;
-
-   /* If font line metrics are not supported just draw as usual */
-   if (!font->font_driver->get_line_metrics(font->font_data, &line_metrics))
-   {
-      size_t msg_len = strlen(msg);
-      if (msg_len <= AVG_GLPYH_LIMIT)
-         switch_font_render_line(sw, font, msg, msg_len,
-               scale, color, pos_x, pos_y, text_align);
-      return;
-   }
-
+   font->font_driver->get_line_metrics(font->font_data, &line_metrics);
    line_height = scale / line_metrics->height;
 
    for (;;)
    {
       const char *delim = strchr(msg, '\n');
-      size_t msg_len    = delim ?
-         (delim - msg) : strlen(msg);
+      size_t msg_len    = delim ? (delim - msg) : strlen(msg);
 
       /* Draw the line */
       if (msg_len <= AVG_GLPYH_LIMIT)
@@ -310,6 +294,8 @@ static void switch_font_render_msg(
 
    if (!font || !msg || (msg && !*msg))
       return;
+   if (!sw || !sw->out_buffer)
+      return;
 
    if (params)
    {
@@ -357,7 +343,10 @@ static bool switch_font_get_line_metrics(void* data, struct font_line_metrics **
 {
    switch_font_t *font = (switch_font_t *)data;
    if (font && font->font_driver && font->font_data)
-      return font->font_driver->get_line_metrics(font->font_data, metrics);
+   {
+      font->font_driver->get_line_metrics(font->font_data, metrics);
+      return true;
+   }
    return false;
 }
 
diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c
index 79f4dc4bf5..6a3ba36ac9 100644
--- a/gfx/drivers/vita2d_gfx.c
+++ b/gfx/drivers/vita2d_gfx.c
@@ -384,28 +384,16 @@ static void vita2d_font_render_message(
       const unsigned int color, float pos_x, float pos_y,
       unsigned width, unsigned height, unsigned text_align)
 {
+   float line_height;
    struct font_line_metrics *line_metrics = NULL;
    int lines                              = 0;
-   float line_height;
-
-   if (!msg || !*msg)
-      return;
-
-   /* If font line metrics are not supported just draw as usual */
-   if (!font->font_driver->get_line_metrics(font->font_data, &line_metrics))
-   {
-      vita2d_font_render_line(font, msg, strlen(msg),
-            scale, color, pos_x, pos_y, width, height, text_align);
-      return;
-   }
-
+   font->font_driver->get_line_metrics(font->font_data, &line_metrics);
    line_height = line_metrics->height * scale / font->vita->vp.height;
 
    for (;;)
    {
       const char *delim = strchr(msg, '\n');
-      size_t msg_len    = (delim) ? 
-         (delim - msg) : strlen(msg);
+      size_t msg_len    = (delim) ? (delim - msg) : strlen(msg);
 
       /* Draw the line */
       vita2d_font_render_line(font, msg, msg_len,
@@ -514,7 +502,10 @@ static bool vita2d_font_get_line_metrics(void* data, struct font_line_metrics **
 {
    vita_font_t *font = (vita_font_t*)data;
    if (font && font->font_driver && font->font_data)
-      return font->font_driver->get_line_metrics(font->font_data, metrics);
+   {
+      font->font_driver->get_line_metrics(font->font_data, metrics);
+      return true;
+   }
    return false;
 }
 
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index 077c11bdac..455947b628 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -1490,28 +1490,16 @@ static void vulkan_font_render_message(
       const float color[4], float pos_x, float pos_y,
       unsigned text_align)
 {
+   float line_height;
    struct font_line_metrics *line_metrics = NULL;
    int lines                              = 0;
-   float line_height;
-
-   if (!msg || !*msg || !font->vk)
-      return;
-
-   /* If font line metrics are not supported just draw as usual */
-   if (!font->font_driver->get_line_metrics(font->font_data, &line_metrics))
-   {
-      vulkan_font_render_line(font->vk, font, msg, strlen(msg),
-            scale, color, pos_x, pos_y, text_align);
-      return;
-   }
-
+   font->font_driver->get_line_metrics(font->font_data, &line_metrics);
    line_height = line_metrics->height * scale / font->vk->vp.height;
 
    for (;;)
    {
       const char *delim = strchr(msg, '\n');
-      size_t msg_len    = delim
-         ? (delim - msg) : strlen(msg);
+      size_t msg_len    = delim ? (delim - msg) : strlen(msg);
 
       /* Draw the line */
       vulkan_font_render_line(font->vk, font, msg, msg_len,
@@ -1623,7 +1611,7 @@ static void vulkan_font_render_msg(
    float video_msg_color_g          = settings->floats.video_msg_color_g;
    float video_msg_color_b          = settings->floats.video_msg_color_b;
 
-   if (!font || !msg || !*msg)
+   if (!font || !msg || !*msg || !font->vk)
       return;
 
    vk             = font->vk;
@@ -1726,7 +1714,10 @@ static bool vulkan_get_line_metrics(void* data,
 {
    vulkan_raster_t *font = (vulkan_raster_t*)data;
    if (font && font->font_driver && font->font_data)
-      return font->font_driver->get_line_metrics(font->font_data, metrics);
+   {
+      font->font_driver->get_line_metrics(font->font_data, metrics);
+      return true;
+   }
    return false;
 }
 
diff --git a/gfx/drivers_font_renderer/bitmapfont.c b/gfx/drivers_font_renderer/bitmapfont.c
index 10d9d17027..1aae073ce0 100644
--- a/gfx/drivers_font_renderer/bitmapfont.c
+++ b/gfx/drivers_font_renderer/bitmapfont.c
@@ -229,16 +229,11 @@ static const char *font_renderer_bmp_get_default_font(void)
    return "";
 }
 
-static bool font_renderer_bmp_get_line_metrics(
+static void font_renderer_bmp_get_line_metrics(
       void* data, struct font_line_metrics **metrics)
 {
    bm_renderer_t *handle = (bm_renderer_t*)data;
-
-   if (!handle)
-      return false;
-
    *metrics = &handle->line_metrics;
-   return true;
 }
 
 font_renderer_driver_t bitmap_font_renderer = {
diff --git a/gfx/drivers_font_renderer/stb.c b/gfx/drivers_font_renderer/stb.c
index 20e3ca2efd..0f4dd88215 100644
--- a/gfx/drivers_font_renderer/stb.c
+++ b/gfx/drivers_font_renderer/stb.c
@@ -232,14 +232,11 @@ static const char *font_renderer_stb_get_default_font(void)
    return NULL;
 }
 
-static bool font_renderer_stb_get_line_metrics(
+static void font_renderer_stb_get_line_metrics(
       void* data, struct font_line_metrics **metrics)
 {
    stb_font_renderer_t *handle = (stb_font_renderer_t*)data;
-   if (!handle)
-      return false;
    *metrics = &handle->line_metrics;
-   return true;
 }
 
 font_renderer_driver_t stb_font_renderer = {
diff --git a/gfx/drivers_font_renderer/stb_unicode.c b/gfx/drivers_font_renderer/stb_unicode.c
index 7e8ca737cd..b46b4380b3 100644
--- a/gfx/drivers_font_renderer/stb_unicode.c
+++ b/gfx/drivers_font_renderer/stb_unicode.c
@@ -341,14 +341,11 @@ static const char *font_renderer_stb_unicode_get_default_font(void)
 #endif
 }
 
-static bool font_renderer_stb_unicode_get_line_metrics(
+static void font_renderer_stb_unicode_get_line_metrics(
       void* data, struct font_line_metrics **metrics)
 {
    stb_unicode_font_renderer_t *handle = (stb_unicode_font_renderer_t*)data;
-   if (!handle)
-      return false;
    *metrics = &handle->line_metrics;
-   return true;
 }
 
 font_renderer_driver_t stb_unicode_font_renderer = {
diff --git a/gfx/font_driver.h b/gfx/font_driver.h
index ff465040a0..e4fb532118 100644
--- a/gfx/font_driver.h
+++ b/gfx/font_driver.h
@@ -63,7 +63,7 @@ typedef struct font_renderer_driver
 
    const char *ident;
 
-   bool (*get_line_metrics)(void* data, struct font_line_metrics **metrics);
+   void (*get_line_metrics)(void* data, struct font_line_metrics **metrics);
 } font_renderer_driver_t;
 
 typedef struct