From 00adc9a2d37665c3addd293d28b506f5b6da5bcd Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 19 Jan 2017 00:01:55 +0100
Subject: [PATCH] Rewrite menu_display_unset_viewport

---
 menu/drivers/materialui.c | 2 +-
 menu/drivers/nuklear.c    | 2 +-
 menu/drivers/xmb.c        | 2 +-
 menu/drivers/xui.cpp      | 2 +-
 menu/drivers/zarch.c      | 2 +-
 menu/menu_display.c       | 4 +---
 menu/menu_display.h       | 2 +-
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index f6a12e6143..6a4410db3d 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -1426,7 +1426,7 @@ static void mui_frame(void *data, video_frame_info_t *video_info)
             height);
 
    menu_display_restore_clear_color();
-   menu_display_unset_viewport();
+   menu_display_unset_viewport(video_info->width, video_info->height);
 }
 
 static void mui_layout(mui_handle_t *mui)
diff --git a/menu/drivers/nuklear.c b/menu/drivers/nuklear.c
index 075c430a66..e70a14aa1f 100644
--- a/menu/drivers/nuklear.c
+++ b/menu/drivers/nuklear.c
@@ -364,7 +364,7 @@ static void nk_menu_frame(void *data, video_frame_info_t *video_info)
          height);
 
    menu_display_restore_clear_color();
-   menu_display_unset_viewport();
+   menu_display_unset_viewport(video_info->width, video_info->height);
 }
 
 static void nk_menu_free(void *data)
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 622b90c9f8..0e2bf7d4f6 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -2904,7 +2904,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
             height);
    }
 
-   menu_display_unset_viewport();
+   menu_display_unset_viewport(video_info->width, video_info->height);
 }
 
 static void xmb_layout_ps3(xmb_handle_t *xmb, int width)
diff --git a/menu/drivers/xui.cpp b/menu/drivers/xui.cpp
index b44aeb1ffa..909efd21e8 100644
--- a/menu/drivers/xui.cpp
+++ b/menu/drivers/xui.cpp
@@ -445,7 +445,7 @@ static void xui_frame(void *data, video_frame_info_t *video_info)
 
    XuiRenderEnd( app.GetDC() );
 
-   menu_display_unset_viewport();
+   menu_display_unset_viewport(video_info->width, video_info->height);
 }
 
 static void blit_line(int x, int y, const char *message, bool green)
diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c
index 510a51c154..1b967fd0d2 100644
--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@@ -983,7 +983,7 @@ static void zarch_frame(void *data, video_frame_info_t *video_info)
    zui->rendering = false;
 
    menu_display_font_flush_block((font_data_t*)zui->font);
-   menu_display_unset_viewport();
+   menu_display_unset_viewport(video_info->width, video_info->height);
 }
 
 static void *zarch_init(void **userdata)
diff --git a/menu/menu_display.c b/menu/menu_display.c
index a13559eab7..ca003a4f46 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -402,10 +402,8 @@ void menu_display_set_viewport(unsigned width, unsigned height)
    video_driver_set_viewport(width, height, true, false);
 }
 
-void menu_display_unset_viewport(void)
+void menu_display_unset_viewport(unsigned width, unsigned height)
 {
-   unsigned width, height;
-   video_driver_get_size(&width, &height);
    video_driver_set_viewport(width, height, false, true);
 }
 
diff --git a/menu/menu_display.h b/menu/menu_display.h
index e127c58128..5310dc4097 100644
--- a/menu/menu_display.h
+++ b/menu/menu_display.h
@@ -228,7 +228,7 @@ bool menu_display_get_font_data_init(void);
 void menu_display_set_font_data_init(bool state);
 bool menu_display_get_update_pending(void);
 void menu_display_set_viewport(unsigned width, unsigned height);
-void menu_display_unset_viewport(void);
+void menu_display_unset_viewport(unsigned width, unsigned height);
 bool menu_display_get_framebuffer_dirty_flag(void);
 void menu_display_set_framebuffer_dirty_flag(void);
 void menu_display_unset_framebuffer_dirty_flag(void);