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

Remove gfx_display_scissor_end

This commit is contained in:
twinaphex 2020-09-28 04:04:16 +02:00
parent d44ab6facf
commit 03ff504aa8
6 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gfx/gfx_display.c
View File

@ -621,20 +621,6 @@ void gfx_display_scissor_begin(void *userdata,
} }
} }
/* End scissoring operation */
void gfx_display_scissor_end(
void *userdata,
unsigned video_width,
unsigned video_height
)
{
gfx_display_t *p_disp = disp_get_ptr();
gfx_display_ctx_driver_t *dispctx = p_disp->dispctx;
if (dispctx && dispctx->scissor_end)
dispctx->scissor_end(userdata,
video_width, video_height);
}
font_data_t *gfx_display_font_file( font_data_t *gfx_display_font_file(
char* fontpath, float menu_font_size, bool is_threaded) char* fontpath, float menu_font_size, bool is_threaded)
{ {

1
gfx/gfx_display.h
View File

@ -252,7 +252,6 @@ font_data_t *gfx_display_font(
bool video_is_threaded); bool video_is_threaded);
void gfx_display_scissor_begin(void *data, unsigned video_width, unsigned video_height, int x, int y, unsigned width, unsigned height); void gfx_display_scissor_begin(void *data, unsigned video_width, unsigned video_height, int x, int y, unsigned width, unsigned height);
void gfx_display_scissor_end(void *data, unsigned width, unsigned height);
void gfx_display_font_free(font_data_t *font); void gfx_display_font_free(font_data_t *font);

10
gfx/gfx_widgets.c
View File

@ -1165,8 +1165,9 @@ static void gfx_widgets_draw_task_msg(
{ {
gfx_widgets_flush_text(video_width, video_height, gfx_widgets_flush_text(video_width, video_height,
&p_dispwidget->gfx_widget_fonts.msg_queue); &p_dispwidget->gfx_widget_fonts.msg_queue);
gfx_display_scissor_end(userdata, if (dispctx && dispctx->scissor_end)
video_width, video_height); dispctx->scissor_end(userdata,
video_width, video_height);
} }
/* Progress text */ /* Progress text */
@ -1276,8 +1277,9 @@ static void gfx_widgets_draw_regular_msg(
gfx_widgets_flush_text(video_width, video_height, &p_dispwidget->gfx_widget_fonts.bold); gfx_widgets_flush_text(video_width, video_height, &p_dispwidget->gfx_widget_fonts.bold);
gfx_widgets_flush_text(video_width, video_height, &p_dispwidget->gfx_widget_fonts.msg_queue); gfx_widgets_flush_text(video_width, video_height, &p_dispwidget->gfx_widget_fonts.msg_queue);
gfx_display_scissor_end(userdata, if (dispctx && dispctx->scissor_end)
video_width, video_height); dispctx->scissor_end(userdata,
video_width, video_height);
} }
if (p_dispwidget->msg_queue_has_icons) if (p_dispwidget->msg_queue_has_icons)

5
gfx/widgets/gfx_widget_achievement_popup.c
View File

@ -238,8 +238,9 @@ static void gfx_widget_achievement_popup_frame(void* data, void* userdata)
{ {
gfx_widgets_flush_text(video_width, video_height, gfx_widgets_flush_text(video_width, video_height,
&p_dispwidget->gfx_widget_fonts.regular); &p_dispwidget->gfx_widget_fonts.regular);
gfx_display_scissor_end(video_info->userdata, if (dispctx && dispctx->scissor_end)
video_width, video_height); dispctx->scissor_end(video_info->userdata,
video_width, video_height);
} }
} }

8
menu/drivers/ozone/ozone.c
View File

@ -2653,6 +2653,8 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
bool input_menu_swap_ok_cancel_buttons = video_info->input_menu_swap_ok_cancel_buttons; bool input_menu_swap_ok_cancel_buttons = video_info->input_menu_swap_ok_cancel_buttons;
bool battery_level_enable = video_info->battery_level_enable; bool battery_level_enable = video_info->battery_level_enable;
bool timedate_enable = video_info->timedate_enable; bool timedate_enable = video_info->timedate_enable;
gfx_display_t *p_disp = disp_get_ptr();
gfx_display_ctx_driver_t *dispctx = p_disp->dispctx;
#if 0 #if 0
static bool reset = false; static bool reset = false;
@ -2808,9 +2810,9 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
libretro_running, libretro_running,
menu_framebuffer_opacity); menu_framebuffer_opacity);
gfx_display_scissor_end(userdata, if (dispctx && dispctx->scissor_end)
video_width, dispctx->scissor_end(userdata,
video_height); video_width, video_height);
/* Flush first layer of text */ /* Flush first layer of text */
ozone_font_flush(video_width, video_height, &ozone->fonts.footer); ozone_font_flush(video_width, video_height, &ozone->fonts.footer);

5
menu/drivers/ozone/ozone_sidebar.c
View File

@ -474,8 +474,9 @@ console_iterate:
ozone_font_flush(video_width, video_height, &ozone->fonts.sidebar); ozone_font_flush(video_width, video_height, &ozone->fonts.sidebar);
gfx_display_scissor_end(userdata, video_width, if (dispctx && dispctx->scissor_end)
video_height); dispctx->scissor_end(userdata,
video_width, video_height);
} }
void ozone_go_to_sidebar(ozone_handle_t *ozone, uintptr_t tag) void ozone_go_to_sidebar(ozone_handle_t *ozone, uintptr_t tag)