Revert "(font drivers) Start using internal render_msg in video driver"

This reverts commit 877ed20.

Author: LibretroAdmin

gfx/drivers/vulkan.c

@@ -5986,18 +5986,9 @@ static bool vulkan_frame(void *data, const void *frame,
       else if (statistics_show)
       {
          if (osd_params)
-         {
-#ifdef HAVE_LANGEXTRA
-            char tmp[512];
-            char *_msg = font_driver_reshape_msg(stat_text,
-                  tmp, sizeof(tmp));
-            vulkan_font_render_msg(vk, video_font_driver,
-                  _msg, osd_params);
-#else
-            vulkan_font_render_msg(vk, video_font_driver, 
-                  stat_text, osd_params);
-#endif
-         }
+            font_driver_render_msg(vk,
+                  stat_text,
+                  osd_params, NULL);
       }
 #endif
 
@@ -6007,16 +5998,7 @@ static bool vulkan_frame(void *data, const void *frame,
 #endif
 
       if (message_visible)
-      {
-#ifdef HAVE_LANGEXTRA
-         char tmp[512];
-         char *_msg = font_driver_reshape_msg(msg,
-               tmp, sizeof(tmp));
-         vulkan_font_render_msg(vk, video_font_driver, _msg, NULL);
-#else
-         vulkan_font_render_msg(vk, video_font_driver, msg, NULL);
-#endif
-      }
+          font_driver_render_msg(vk, msg, NULL, NULL);
 
 #ifdef HAVE_GFX_WIDGETS
       if (widgets_active)

gfx/font_driver.c

@@ -26,7 +26,7 @@
 #include "video_thread_wrapper.h"
 
 /* TODO/FIXME - global */
-void *video_font_driver = NULL;
+static void *video_font_driver = NULL;
 
 int font_renderer_create_default(
       const font_renderer_driver_t **drv,
@@ -663,14 +663,14 @@ static INLINE unsigned font_get_arabic_replacement(
 }
 /* clang-format on */
 
-char* font_driver_reshape_msg(const char* msg, char *s, size_t len)
+static char* font_driver_reshape_msg(const char* msg, unsigned char *s, size_t len)
 {
    const unsigned char *src;
    bool                 reverse    = false;
    size_t               msg_len    = strlen(msg);
    /* worst case transformations are 2 bytes to 4 bytes -- aliaspider */
    size_t               _len       = (msg_len * 2) + 1;
-   char                *dst        = s;
+   unsigned char       *dst        = s;
 
    if (len < _len)
    {
@@ -686,7 +686,7 @@ char* font_driver_reshape_msg(const char* msg, char *s, size_t len)
        * dst <= 2k while src = len/2 + k, and 2k < len/2 + k
        * holds for all k < len/2, which is guaranteed since
        * msg_len < len/2. */
-      char *copy_dst;
+      unsigned char *copy_dst;
       msg_len = (len / 2) - 1;
       /* Back up to a UTF-8 character boundary */
       while (msg_len > 0 && IS_MBCONT((const unsigned char*)&msg[msg_len]))
@@ -796,14 +796,14 @@ void font_driver_render_msg(void *data, const char *msg,
    if (renderer && renderer->render_msg)
    {
 #ifdef HAVE_LANGEXTRA
-      char tmp[512];
-      char *_msg = font_driver_reshape_msg(msg,
-            tmp, sizeof(tmp));
+      unsigned char tmp_buffer[512];
+      char *new_msg = font_driver_reshape_msg(msg,
+            tmp_buffer, sizeof(tmp_buffer));
 #else
-      char *_msg = (char*)msg;
+      char *new_msg = (char*)msg;
 #endif
       renderer->render_msg(data,
-            font->renderer_data, _msg, params);
+            font->renderer_data, new_msg, params);
    }
 }
 

gfx/font_driver.h

@@ -135,8 +135,6 @@ void font_driver_init_osd(
 
 void font_driver_free_osd(void);
 
-char* font_driver_reshape_msg(const char* msg, char *s, size_t len);
-
 int font_driver_get_line_height(font_data_t *font, float scale);
 int font_driver_get_line_ascender(font_data_t *font, float scale);
 int font_driver_get_line_descender(font_data_t *font, float scale);
@@ -168,9 +166,6 @@ extern font_renderer_driver_t freetype_font_renderer;
 extern font_renderer_driver_t coretext_font_renderer;
 extern font_renderer_driver_t bitmap_font_renderer;
 
-/* TODO/FIXME - global */
-extern void *video_font_driver;
-
 RETRO_END_DECLS
 
 #endif