libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-02 06:53:39 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

(gfx_display.c) Cleanups -

Browse Source 
- get rid of unused gfx_display_driver_exists
- get rid of useless wrapper function gfx_display_font_init_first
- rewrite gfx_display_font_file somewhat
This commit is contained in:
libretroadmin 2022-07-06 20:05:43 +02:00
parent aeb07432cc
commit 92264826de
2 changed files with 15 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
gfx/gfx_display.c
View File

@ -43,16 +43,6 @@ gfx_display_t *disp_get_ptr(void)
return &dispgfx_st; return &dispgfx_st;
} }
static bool gfx_display_font_init_first(
void **font_handle, void *video_data,
const char *font_path, float font_size,
bool is_threaded, enum font_driver_render_api font_type)
{
font_data_t **handle = (font_data_t**)font_handle;
return ((*handle = font_driver_init_first(video_data,
font_path, font_size, true, is_threaded, font_type)));
}
static const float *null_get_default_matrix(void) static const float *null_get_default_matrix(void)
{ {
static float dummy[16] = {0.0f}; static float dummy[16] = {0.0f};
@ -472,25 +462,23 @@ font_data_t *gfx_display_font_file(
gfx_display_t *p_disp, gfx_display_t *p_disp,
char* fontpath, float menu_font_size, bool is_threaded) char* fontpath, float menu_font_size, bool is_threaded)
{ {
font_data_t *font_data = NULL;
float font_size = menu_font_size;
gfx_display_ctx_driver_t *dispctx = p_disp->dispctx; gfx_display_ctx_driver_t *dispctx = p_disp->dispctx;
if (!dispctx) if (dispctx)
return NULL; {
font_data_t *font_data = NULL;
/* Font size must be at least 2, or font_init_first() float font_size = menu_font_size;
* will generate a heap-buffer-overflow when using /* Font size must be at least 2, or font_init_first()
* many font drivers */ * will generate a heap-buffer-overflow when using
if (font_size < 2.0f) * many font drivers */
font_size = 2.0f; if (font_size < 2.0f)
font_size = 2.0f;
if (!gfx_display_font_init_first((void**)&font_data, if ((font_data = font_driver_init_first(video_driver_get_ptr(),
video_driver_get_ptr(), fontpath, font_size, true, is_threaded,
fontpath, font_size, is_threaded, dispctx->font_type)) dispctx->font_type)))
return NULL; return font_data;
}
return font_data; return NULL;
} }
/* Draw text on top of the screen */ /* Draw text on top of the screen */
@ -1289,18 +1277,6 @@ void gfx_display_init(void)
p_dispca->allocated = 0; p_dispca->allocated = 0;
} }
bool gfx_display_driver_exists(const char *s)
{
unsigned i;
for (i = 0; i < ARRAY_SIZE(gfx_display_ctx_drivers); i++)
{
if (string_is_equal(s, gfx_display_ctx_drivers[i]->ident))
return true;
}
return false;
}
bool gfx_display_init_first_driver(gfx_display_t *p_disp, bool gfx_display_init_first_driver(gfx_display_t *p_disp,
bool video_is_threaded) bool video_is_threaded)
{ {

2
gfx/gfx_display.h
View File

@ -333,8 +333,6 @@ void gfx_display_deinit_white_texture(void);
void gfx_display_init_white_texture(void); void gfx_display_init_white_texture(void);
bool gfx_display_driver_exists(const char *s);
bool gfx_display_init_first_driver(gfx_display_t *p_disp, bool gfx_display_init_first_driver(gfx_display_t *p_disp,
bool video_is_threaded); bool video_is_threaded);