gfx_display_draw_cursor - take out early return

This commit is contained in:
twinaphex 2020-10-01 18:22:01 +02:00
parent 8e5596873a
commit cecd48e6b5
5 changed files with 53 additions and 52 deletions

View File

@ -1213,9 +1213,6 @@ void gfx_display_draw_cursor(
gfx_display_t *p_disp = disp_get_ptr();
gfx_display_ctx_driver_t *dispctx = p_disp->dispctx;
if (!cursor_visible)
return;
coords.vertices = 4;
coords.vertex = NULL;
coords.tex_coord = NULL;

View File

@ -6796,18 +6796,19 @@ static void materialui_frame(void *data, video_frame_info_t *video_info)
bool cursor_visible = video_fullscreen
&& menu_mouse_enable;
gfx_display_draw_cursor(
userdata,
video_width,
video_height,
cursor_visible,
color_white,
mui->cursor_size,
mui->textures.list[MUI_TEXTURE_POINTER],
mui->pointer.x,
mui->pointer.y,
video_width,
video_height);
if (cursor_visible)
gfx_display_draw_cursor(
userdata,
video_width,
video_height,
cursor_visible,
color_white,
mui->cursor_size,
mui->textures.list[MUI_TEXTURE_POINTER],
mui->pointer.x,
mui->pointer.y,
video_width,
video_height);
}
/* Undo any transparency adjustments caused

View File

@ -2904,19 +2904,20 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
bool cursor_visible = video_fullscreen && menu_mouse_enable;
gfx_display_set_alpha(ozone_pure_white, 1.0f);
gfx_display_draw_cursor(
userdata,
video_width,
video_height,
cursor_visible,
ozone_pure_white,
ozone->dimensions.cursor_size,
ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_POINTER],
ozone->pointer.x,
ozone->pointer.y,
video_width,
video_height
);
if (cursor_visible)
gfx_display_draw_cursor(
userdata,
video_width,
video_height,
cursor_visible,
ozone_pure_white,
ozone->dimensions.cursor_size,
ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_POINTER],
ozone->pointer.x,
ozone->pointer.y,
video_width,
video_height
);
}
/* Unbind fonts */

View File

@ -3034,18 +3034,19 @@ static void stripes_frame(void *data, video_frame_info_t *video_info)
gfx_display_set_alpha(stripes_coord_white, MIN(stripes->alpha, 1.00f));
gfx_display_draw_cursor(
userdata,
video_width,
video_height,
cursor_visible,
&stripes_coord_white[0],
stripes->cursor_size,
stripes->textures.list[STRIPES_TEXTURE_POINTER],
pointer.x,
pointer.y,
video_width,
video_height);
if (cursor_visible)
gfx_display_draw_cursor(
userdata,
video_width,
video_height,
cursor_visible,
&stripes_coord_white[0],
stripes->cursor_size,
stripes->textures.list[STRIPES_TEXTURE_POINTER],
pointer.x,
pointer.y,
video_width,
video_height);
}
video_driver_set_viewport(video_width, video_height, false, true);

View File

@ -5281,18 +5281,19 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
&& menu_mouse_enable;
gfx_display_set_alpha(coord_white, MIN(xmb->alpha, 1.00f));
gfx_display_draw_cursor(
userdata,
video_width,
video_height,
cursor_visible,
&coord_white[0],
xmb->cursor_size,
xmb->textures.list[XMB_TEXTURE_POINTER],
xmb->pointer.x,
xmb->pointer.y,
video_width,
video_height);
if (cursor_visible)
gfx_display_draw_cursor(
userdata,
video_width,
video_height,
cursor_visible,
&coord_white[0],
xmb->cursor_size,
xmb->textures.list[XMB_TEXTURE_POINTER],
xmb->pointer.x,
xmb->pointer.y,
video_width,
video_height);
}
video_driver_set_viewport(video_width, video_height, false, true);