ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2020-10-05 21:44:13 +02:00
parent 088e6b9e44
commit 54f30e31a1
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gfx/gfx_thumbnail.c
View File

@ -656,7 +656,6 @@ void gfx_thumbnail_get_draw_dimensions(
error: error:
*draw_width = 0.0f; *draw_width = 0.0f;
*draw_height = 0.0f; *draw_height = 0.0f;
return;
} }
/* Draws specified thumbnail with specified alignment /* Draws specified thumbnail with specified alignment
@ -679,10 +678,14 @@ void gfx_thumbnail_draw(
float alpha, float scale_factor, float alpha, float scale_factor,
gfx_thumbnail_shadow_t *shadow) gfx_thumbnail_shadow_t *shadow)
{ {
gfx_display_t *p_disp = disp_get_ptr();
gfx_display_ctx_driver_t *dispctx = p_disp->dispctx;
/* Sanity check */ /* Sanity check */
if (!thumbnail || if (!thumbnail ||
(width < 1) || (height < 1) || (alpha <= 0.0f) || (scale_factor <= 0.0f)) (width < 1) || (height < 1) || (alpha <= 0.0f) || (scale_factor <= 0.0f))
return; return;
if (!dispctx)
return;
/* Only draw thumbnail if it is available... */ /* Only draw thumbnail if it is available... */
if (thumbnail->status == GFX_THUMBNAIL_STATUS_AVAILABLE) if (thumbnail->status == GFX_THUMBNAIL_STATUS_AVAILABLE)
@ -695,8 +698,6 @@ void gfx_thumbnail_draw(
float draw_height; float draw_height;
float draw_x; float draw_x;
float draw_y; float draw_y;
gfx_display_t *p_disp = disp_get_ptr();
gfx_display_ctx_driver_t *dispctx = p_disp->dispctx;
float thumbnail_alpha = thumbnail->alpha * alpha; float thumbnail_alpha = thumbnail->alpha * alpha;
float thumbnail_color[16] = { float thumbnail_color[16] = {
1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
@ -708,7 +709,7 @@ void gfx_thumbnail_draw(
/* Set thumbnail opacity */ /* Set thumbnail opacity */
if (thumbnail_alpha <= 0.0f) if (thumbnail_alpha <= 0.0f)
return; return;
else if (thumbnail_alpha < 1.0f) if (thumbnail_alpha < 1.0f)
gfx_display_set_alpha(thumbnail_color, thumbnail_alpha); gfx_display_set_alpha(thumbnail_color, thumbnail_alpha);
/* Get thumbnail dimensions */ /* Get thumbnail dimensions */
@ -716,7 +717,7 @@ void gfx_thumbnail_draw(
thumbnail, width, height, scale_factor, thumbnail, width, height, scale_factor,
&draw_width, &draw_height); &draw_width, &draw_height);
if (dispctx && dispctx->blend_begin) if (dispctx->blend_begin)
dispctx->blend_begin(userdata); dispctx->blend_begin(userdata);
/* Perform 'rotation' step /* Perform 'rotation' step
@ -843,7 +844,7 @@ void gfx_thumbnail_draw(
/* Draw shadow */ /* Draw shadow */
if (draw.height > 0 && draw.width > 0) if (draw.height > 0 && draw.width > 0)
if (dispctx && dispctx->draw) if (dispctx->draw)
dispctx->draw(&draw, userdata, video_width, video_height); dispctx->draw(&draw, userdata, video_width, video_height);
} }
} }
@ -856,13 +857,11 @@ void gfx_thumbnail_draw(
draw.y = draw_y; draw.y = draw_y;
/* Draw thumbnail */ /* Draw thumbnail */
if (dispctx)
{
if (dispctx->draw)
if (draw.height > 0 && draw.width > 0) if (draw.height > 0 && draw.width > 0)
if (dispctx->draw)
dispctx->draw(&draw, userdata, video_width, video_height); dispctx->draw(&draw, userdata, video_width, video_height);
if (dispctx->blend_end) if (dispctx->blend_end)
dispctx->blend_end(userdata); dispctx->blend_end(userdata);
} }
} }
}