mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(gfx_display) Cleanups

Browse Source
This commit is contained in:
libretroadmin 2023-05-28 21:59:50 +02:00
parent 3b823d18d5
commit fe05fad714
1 changed files with 34 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
gfx/gfx_display.c
View File

@ -123,28 +123,6 @@ static gfx_display_ctx_driver_t *gfx_display_ctx_drivers[] = {
NULL, NULL,
}; };
static float gfx_display_get_adjusted_scale(
gfx_display_t *p_disp,
float base_scale, float scale_factor, unsigned width)
{
/* Apply user-set scaling factor */
float adjusted_scale = base_scale * scale_factor;
#ifdef HAVE_OZONE
/* Ozone has a capped scale factor */
if (p_disp->menu_driver_id == MENU_DRIVER_ID_OZONE)
{
float new_width = (float)width * 0.3333333f;
if (((float)OZONE_SIDEBAR_WIDTH * adjusted_scale)
> new_width)
adjusted_scale = (new_width / (float)OZONE_SIDEBAR_WIDTH);
}
#endif
/* Ensure final scale is 'sane' */
if (adjusted_scale > 0.0001f)
return adjusted_scale;
return 1.0f;
}
/* Check if the current menu driver is compatible /* Check if the current menu driver is compatible
* with your video driver. */ * with your video driver. */
static bool gfx_display_check_compatibility( static bool gfx_display_check_compatibility(
@ -370,10 +348,7 @@ float gfx_display_get_dpi_scale(
menu_scale_factor = 1.0f; menu_scale_factor = 1.0f;
else else
#endif #endif
{ menu_scale_factor = settings->floats.menu_scale_factor;
float _menu_scale_factor = settings->floats.menu_scale_factor;
menu_scale_factor = _menu_scale_factor;
}
} }
} }
#endif #endif
@ -396,14 +371,23 @@ float gfx_display_get_dpi_scale(
/* Adjusted scale calculation may also be slow, so /* Adjusted scale calculation may also be slow, so
* only update if something changes */ * only update if something changes */
if ( scale_updated if ( scale_updated
|| (menu_scale_factor != last_menu_scale_factor) || (menu_scale_factor != last_menu_scale_factor)
|| (p_disp->menu_driver_id != last_menu_driver_id)) || (p_disp->menu_driver_id != last_menu_driver_id))
{ {
adjusted_scale = gfx_display_get_adjusted_scale( adjusted_scale = scale * menu_scale_factor;
p_disp, #ifdef HAVE_OZONE
scale, menu_scale_factor, width); if (p_disp->menu_driver_id == MENU_DRIVER_ID_OZONE)
last_menu_scale_factor = menu_scale_factor; {
last_menu_driver_id = p_disp->menu_driver_id; /* Ozone has a capped scale factor */
float new_width = (float)width * 0.3333333f;
if (((float)OZONE_SIDEBAR_WIDTH * adjusted_scale)
> new_width)
adjusted_scale = (new_width / (float)OZONE_SIDEBAR_WIDTH);
}
#endif
adjusted_scale = (adjusted_scale > 0.0001f) ? adjusted_scale : 1.0f;
last_menu_scale_factor = menu_scale_factor;
last_menu_driver_id = p_disp->menu_driver_id;
} }
return adjusted_scale; return adjusted_scale;
@ -1143,25 +1127,27 @@ bool gfx_display_reset_textures_list_buffer(
{ {
struct texture_image ti; struct texture_image ti;
ti.width = 0; ti.width = 0;
ti.height = 0; ti.height = 0;
ti.pixels = NULL; ti.pixels = NULL;
ti.supports_rgba = video_driver_supports_rgba(); ti.supports_rgba = video_driver_supports_rgba();
if (!image_texture_load_buffer(&ti, image_type, buffer, buffer_len)) if (image_texture_load_buffer(&ti, image_type, buffer, buffer_len))
return false; {
if (width)
*width = ti.width;
if (width) if (height)
*width = ti.width; *height = ti.height;
if (height) /* if the poke interface doesn't support texture load then return false */
*height = ti.height; if (video_driver_texture_load(&ti, filter_type, item))
{
/* if the poke interface doesn't support texture load then return false */ image_texture_free(&ti);
if (!video_driver_texture_load(&ti, filter_type, item)) return true;
return false; }
image_texture_free(&ti); }
return true; return false;
} }
/* NOTE: Reads image from file */ /* NOTE: Reads image from file */