mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-31 15:32:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(RGUI) Move menu_display_font_framebuffer to rgui.c"

Browse Source 
This reverts commit 1a3ec1c3be85df8262a2aa9b4460c0545491ca5c.
This commit is contained in:
twinaphex 2019-04-04 17:51:58 +02:00
parent 1a3ec1c3be
commit d7d260556b
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
menu/drivers/rgui.c
View File

@ -499,11 +499,9 @@ typedef struct
struct scaler_ctx image_scaler;
} rgui_t;
static unsigned mini_thumbnail_max_width = 0;
static unsigned mini_thumbnail_max_width = 0;
static unsigned mini_thumbnail_max_height = 0;
static const uint8_t *rgui_font_framebuf = NULL;
typedef struct
{
unsigned max_width;
@ -1561,7 +1559,7 @@ static bool init_font(menu_handle_t *menu, const uint8_t *font_bmp_buf)
font_bmp_buf + 54 + 3 * (256 * (255 - 16 * y) + 16 * x));
}
rgui_font_framebuf = font;
menu_display_set_font_framebuffer(font);
return true;
}
@ -1582,7 +1580,7 @@ static bool rguidisp_init_font(menu_handle_t *menu)
return init_font(menu, font_bmp_buf);
#endif
rgui_font_framebuf = font_bin_buf;
menu_display_set_font_framebuffer(font_bin_buf);
return true;
}
@ -1663,7 +1661,7 @@ static void rgui_render_messagebox(rgui_t *rgui, const char *message)
struct string_list *list = NULL;
settings_t *settings = config_get_ptr();
size_t pitch = menu_display_get_framebuffer_pitch();
const uint8_t *font_fb = rgui_font_framebuf;
const uint8_t *font_fb = menu_display_get_font_framebuffer();
(void)settings;
if (!message || !*message)
@ -1793,7 +1791,7 @@ static void rgui_render(void *data, bool is_idle)
settings_t *settings = config_get_ptr();
rgui_t *rgui = (rgui_t*)data;
size_t pitch = menu_display_get_framebuffer_pitch();
const uint8_t *font_fb = rgui_font_framebuf;
const uint8_t *font_fb = menu_display_get_font_framebuffer();
static bool display_kb = false;
bool current_display_cb = false;
@ -2661,7 +2659,7 @@ static void rgui_free(void *data)
}
fb_font_inited = menu_display_get_font_data_init();
font_fb = rgui_font_framebuf;
font_fb = menu_display_get_font_framebuffer();
if (fb_font_inited)
free((void*)font_fb);

11
menu/menu_driver.c
View File

@ -183,6 +183,7 @@ static bool menu_display_has_windowed = false;
static bool menu_display_msg_force = false;
static bool menu_display_font_alloc_framebuf = false;
static bool menu_display_framebuf_dirty = false;
static const uint8_t *menu_display_font_framebuf = NULL;
static menu_display_ctx_driver_t *menu_disp = NULL;
/* when enabled, on next iteration the 'Quick Menu' list will
@ -501,6 +502,16 @@ video_coord_array_t *menu_display_get_coords_array(void)
return &menu_disp_ca;
}
const uint8_t *menu_display_get_font_framebuffer(void)
{
return menu_display_font_framebuf;
}
void menu_display_set_font_framebuffer(const uint8_t *buffer)
{
menu_display_font_framebuf = buffer;
}
bool menu_display_libretro_running(
bool rarch_is_inited,
bool rarch_is_dummy_core)

2
menu/menu_driver.h
View File

@ -549,6 +549,8 @@ void menu_display_font_free(font_data_t *font);
void menu_display_coords_array_reset(void);
video_coord_array_t *menu_display_get_coords_array(void);
const uint8_t *menu_display_get_font_framebuffer(void);
void menu_display_set_font_framebuffer(const uint8_t *buffer);
bool menu_display_libretro(bool is_idle, bool is_inited, bool is_dummy);
bool menu_display_libretro_running(bool rarch_is_inited,
bool rarch_is_dummy_core);