From 3a37e13a54fb0816b235fc12399357909cd56600 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 15 Sep 2020 11:05:47 +0200 Subject: [PATCH] Call video_driver_set_viewport directly --- gfx/gfx_display.c | 10 ---------- gfx/gfx_display.h | 2 -- gfx/gfx_widgets.c | 4 ++-- menu/drivers/materialui.c | 4 ++-- menu/drivers/ozone/ozone.c | 4 ++-- menu/drivers/stripes.c | 2 +- menu/drivers/xmb.c | 4 ++-- retroarch.c | 12 +++++------- retroarch.h | 2 +- 9 files changed, 15 insertions(+), 29 deletions(-) diff --git a/gfx/gfx_display.c b/gfx/gfx_display.c index f8ec2f1e44..30ee52e3a6 100644 --- a/gfx/gfx_display.c +++ b/gfx/gfx_display.c @@ -1634,16 +1634,6 @@ bool gfx_display_get_update_pending(void) return false; } -void gfx_display_set_viewport(unsigned width, unsigned height) -{ - video_driver_set_viewport(width, height, true, false); -} - -void gfx_display_unset_viewport(unsigned width, unsigned height) -{ - video_driver_set_viewport(width, height, false, true); -} - /* Checks if the display framebuffer has its 'dirty flag' set. This * means that the current contents of the framebuffer has changed * and that it has to be rendered to the screen. */ diff --git a/gfx/gfx_display.h b/gfx/gfx_display.h index bf437a58d0..97aa130c3c 100644 --- a/gfx/gfx_display.h +++ b/gfx/gfx_display.h @@ -279,8 +279,6 @@ void gfx_display_set_framebuffer_pitch(size_t pitch); bool gfx_display_get_msg_force(void); void gfx_display_set_msg_force(bool state); bool gfx_display_get_update_pending(void); -void gfx_display_set_viewport(unsigned width, unsigned height); -void gfx_display_unset_viewport(unsigned width, unsigned height); bool gfx_display_get_framebuffer_dirty_flag(void); void gfx_display_set_framebuffer_dirty_flag(void); void gfx_display_unset_framebuffer_dirty_flag(void); diff --git a/gfx/gfx_widgets.c b/gfx/gfx_widgets.c index b72989ad00..6b339276a0 100644 --- a/gfx/gfx_widgets.c +++ b/gfx/gfx_widgets.c @@ -1321,7 +1321,7 @@ void gfx_widgets_frame(void *data) p_dispwidget->gfx_widgets_frame_count++; - gfx_display_set_viewport(video_width, video_height); + video_driver_set_viewport(video_width, video_height, true, false); /* Font setup */ gfx_widgets_font_bind(&p_dispwidget->gfx_widget_fonts.regular); @@ -1550,7 +1550,7 @@ void gfx_widgets_frame(void *data) gfx_widgets_font_unbind(&p_dispwidget->gfx_widget_fonts.bold); gfx_widgets_font_unbind(&p_dispwidget->gfx_widget_fonts.msg_queue); - gfx_display_unset_viewport(video_width, video_height); + video_driver_set_viewport(video_width, video_height, false, true); } bool gfx_widgets_init(uintptr_t widgets_active_ptr, diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index f70610e5d5..5389fdad82 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -6585,7 +6585,7 @@ static void materialui_frame(void *data, video_frame_info_t *video_info) if (!mui) return; - gfx_display_set_viewport(video_width, video_height); + video_driver_set_viewport(video_width, video_height, true, false); /* Clear text */ materialui_font_bind(&mui->font_data.title); @@ -6796,7 +6796,7 @@ static void materialui_frame(void *data, video_frame_info_t *video_info) materialui_font_unbind(&mui->font_data.list); materialui_font_unbind(&mui->font_data.hint); - gfx_display_unset_viewport(video_width, video_height); + video_driver_set_viewport(video_width, video_height, false, true); } /* Determines current list view type, based on diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c index 6f7dbb60f7..c6af807420 100644 --- a/menu/drivers/ozone/ozone.c +++ b/menu/drivers/ozone/ozone.c @@ -2697,7 +2697,7 @@ static void ozone_frame(void *data, video_frame_info_t *video_info) last_use_preferred_system_color_theme = use_preferred_system_color_theme; } - gfx_display_set_viewport(video_width, video_height); + video_driver_set_viewport(video_width, video_height, true, false); /* Clear text */ ozone_font_bind(&ozone->fonts.footer); @@ -2915,7 +2915,7 @@ static void ozone_frame(void *data, video_frame_info_t *video_info) ozone_font_unbind(&ozone->fonts.entries_sublabel); ozone_font_unbind(&ozone->fonts.sidebar); - gfx_display_unset_viewport(video_width, video_height); + video_driver_set_viewport(video_width, video_height, false, true); } static void ozone_set_header(ozone_handle_t *ozone) diff --git a/menu/drivers/stripes.c b/menu/drivers/stripes.c index cf122d095d..b8525b6f0d 100644 --- a/menu/drivers/stripes.c +++ b/menu/drivers/stripes.c @@ -3082,7 +3082,7 @@ static void stripes_frame(void *data, video_frame_info_t *video_info) video_height); } - gfx_display_unset_viewport(video_width, video_height); + video_driver_set_viewport(video_width, video_height, false, true); } static void stripes_layout_ps3(stripes_handle_t *stripes, int width, int height) diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index ac50ed5d98..b1910db481 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -4025,7 +4025,7 @@ static void xmb_draw_bg( draw.pipeline_active = xmb_shader_pipeline_active(menu_shader_pipeline); gfx_display_blend_begin(userdata); - gfx_display_set_viewport(video_width, video_height); + video_driver_set_viewport(video_width, video_height, true, false); #ifdef HAVE_SHADERPIPELINE if (menu_shader_pipeline > XMB_SHADER_PIPELINE_WALLPAPER @@ -5231,7 +5231,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) video_height); } - gfx_display_unset_viewport(video_width, video_height); + video_driver_set_viewport(video_width, video_height, false, true); } static void xmb_layout_ps3(xmb_handle_t *xmb, int width) diff --git a/retroarch.c b/retroarch.c index c440108940..0397b18b1c 100644 --- a/retroarch.c +++ b/retroarch.c @@ -32028,16 +32028,14 @@ error: return false; } -bool video_driver_set_viewport(unsigned width, unsigned height, +void video_driver_set_viewport(unsigned width, unsigned height, bool force_fullscreen, bool allow_rotate) { struct rarch_state *p_rarch = &rarch_st; - if (!p_rarch->current_video || !p_rarch->current_video->set_viewport) - return false; - p_rarch->current_video->set_viewport( - p_rarch->video_driver_data, width, height, - force_fullscreen, allow_rotate); - return true; + if (p_rarch->current_video && p_rarch->current_video->set_viewport) + p_rarch->current_video->set_viewport( + p_rarch->video_driver_data, width, height, + force_fullscreen, allow_rotate); } bool video_driver_set_rotation(unsigned rotation) diff --git a/retroarch.h b/retroarch.h index d4005c5eff..6a9aee1096 100644 --- a/retroarch.h +++ b/retroarch.h @@ -1610,7 +1610,7 @@ void video_driver_set_filtering(unsigned index, bool smooth, bool ctx_scaling); const char *video_driver_get_ident(void); -bool video_driver_set_viewport(unsigned width, unsigned height, +void video_driver_set_viewport(unsigned width, unsigned height, bool force_fullscreen, bool allow_rotate); void video_driver_get_size(unsigned *width, unsigned *height);