Remove is_shutdown from check_window

gfx/common/x11_common.c

@@ -598,8 +598,7 @@ bool x11_alive(void *data)
 }
 
 void x11_check_window(void *data, bool *quit,
-   bool *resize, unsigned *width, unsigned *height,
+   bool *resize, unsigned *width, unsigned *height)
-   bool is_shutdown)
 {
    unsigned new_width  = *width;
    unsigned new_height = *height;

gfx/drivers/gdi_gfx.c

@@ -380,14 +380,13 @@ static bool gdi_gfx_alive(void *data)
    bool quit            = false;
    bool resize          = false;
    bool ret             = false;
-   bool is_shutdown     = rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL);
    gdi_t *gdi           = (gdi_t*)data;
 
    /* Needed because some context drivers don't track their sizes */
    video_driver_get_size(&temp_width, &temp_height);
 
    gdi->ctx_driver->check_window(gdi->ctx_data,
-            &quit, &resize, &temp_width, &temp_height, is_shutdown);
+            &quit, &resize, &temp_width, &temp_height);
 
    ret = !quit;
 

gfx/drivers/gl.c

@@ -3946,12 +3946,11 @@ static bool gl2_alive(void *data)
    bool quit            = false;
    bool resize          = false;
    gl_t         *gl     = (gl_t*)data;
-   bool is_shutdown     = rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL);
    unsigned temp_width  = gl->video_width;
    unsigned temp_height = gl->video_height;
 
    gl->ctx_driver->check_window(gl->ctx_data,
-         &quit, &resize, &temp_width, &temp_height, is_shutdown);
+         &quit, &resize, &temp_width, &temp_height);
 
    if (quit)
       gl->quitting = true;

gfx/drivers/gl1.c

@@ -964,14 +964,13 @@ static bool gl1_gfx_alive(void *data)
    bool quit            = false;
    bool resize          = false;
    bool ret             = false;
-   bool is_shutdown     = rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL);
    gl1_t *gl1           = (gl1_t*)data;
 
    /* Needed because some context drivers don't track their sizes */
    video_driver_get_size(&temp_width, &temp_height);
 
    gl1->ctx_driver->check_window(gl1->ctx_data,
-            &quit, &resize, &temp_width, &temp_height, is_shutdown);
+            &quit, &resize, &temp_width, &temp_height);
 
    if (resize)
       gl1->should_resize = true;

gfx/drivers/gl_core.c

@@ -1549,12 +1549,11 @@ static bool gl_core_alive(void *data)
    bool quit            = false;
    bool resize          = false;
    gl_core_t *gl        = (gl_core_t*)data;
-   bool is_shutdown     = rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL);
    unsigned temp_width  = gl->video_width;
    unsigned temp_height = gl->video_height;
 
    gl->ctx_driver->check_window(gl->ctx_data,
-         &quit, &resize, &temp_width, &temp_height, is_shutdown);
+         &quit, &resize, &temp_width, &temp_height);
 
    if (quit)
       gl->quitting = true;

gfx/drivers/network_gfx.c

@@ -337,14 +337,13 @@ static bool network_gfx_alive(void *data)
    unsigned temp_height = 0;
    bool quit            = false;
    bool resize          = false;
-   bool is_shutdown     = rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL);
    network_video_t *network       = (network_video_t*)data;
 
    /* Needed because some context drivers don't track their sizes */
    video_driver_get_size(&temp_width, &temp_height);
 
    network->ctx_driver->check_window(network->ctx_data,
-            &quit, &resize, &temp_width, &temp_height, is_shutdown);
+            &quit, &resize, &temp_width, &temp_height);
 
    if (temp_width != 0 && temp_height != 0)
       video_driver_set_size(temp_width, temp_height);

gfx/drivers/sixel_gfx.c

@@ -439,14 +439,13 @@ static bool sixel_gfx_alive(void *data)
    unsigned temp_height = 0;
    bool quit            = false;
    bool resize          = false;
-   bool is_shutdown     = rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL);
    sixel_t *sixel       = (sixel_t*)data;
 
    /* Needed because some context drivers don't track their sizes */
    video_driver_get_size(&temp_width, &temp_height);
 
    sixel->ctx_driver->check_window(sixel->ctx_data,
-            &quit, &resize, &temp_width, &temp_height, is_shutdown);
+            &quit, &resize, &temp_width, &temp_height);
 
    if (temp_width != 0 && temp_height != 0)
       video_driver_set_size(temp_width, temp_height);

gfx/drivers/vg.c

@@ -467,10 +467,9 @@ static bool vg_alive(void *data)
    unsigned temp_width  = 0;
    unsigned temp_height = 0;
    vg_t            *vg  = (vg_t*)data;
-   bool is_shutdown     = rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL);
 
    vg->ctx_driver->check_window(vg->ctx_data,
-            &quit, &resize, &temp_width, &temp_height, is_shutdown);
+            &quit, &resize, &temp_width, &temp_height);
 
    if (temp_width != 0 && temp_height != 0)
       video_driver_set_size(temp_width, temp_height);

gfx/drivers/vulkan.c

@@ -1342,12 +1342,11 @@ static bool vulkan_alive(void *data)
    bool quit            = false;
    bool resize          = false;
    vk_t *vk             = (vk_t*)data;
-   bool is_shutdown     = rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL);
    unsigned temp_width  = vk->video_width;
    unsigned temp_height = vk->video_height;
 
    vk->ctx_driver->check_window(vk->ctx_data,
-            &quit, &resize, &temp_width, &temp_height, is_shutdown);
+            &quit, &resize, &temp_width, &temp_height);
 
    if (quit)
       vk->quitting      = true;

gfx/drivers_context/android_ctx.c

@@ -215,8 +215,7 @@ static void android_gfx_ctx_get_video_size(void *data,
 }
 
 static void android_gfx_ctx_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height,
+      bool *resize, unsigned *width, unsigned *height)
-      bool is_shutdown)
 {
 #ifdef HAVE_VULKAN
    struct android_app *android_app = (struct android_app*)g_android;
@@ -265,10 +264,6 @@ static void android_gfx_ctx_check_window(void *data, bool *quit,
       *height = new_height;
       *resize = true;
    }
-
-   /* Check if we are exiting. */
-   if (is_shutdown)
-      *quit = true;
 }
 
 static bool android_gfx_ctx_set_resize(void *data,

gfx/drivers_context/cgl_ctx.c

@@ -81,7 +81,7 @@ static void gfx_ctx_cgl_get_video_size(void *data, unsigned *width, unsigned *he
 }
 
 static void gfx_ctx_cgl_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
+      bool *resize, unsigned *width, unsigned *height)
 {
    unsigned new_width  = 0;
    unsigned new_height = 0;

gfx/drivers_context/cocoa_gl_ctx.m

@@ -545,7 +545,7 @@ static void cocoagl_gfx_ctx_bind_hw_render(void *data, bool enable)
 }
 
 static void cocoagl_gfx_ctx_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
+      bool *resize, unsigned *width, unsigned *height)
 {
    unsigned new_width, new_height;
 #ifdef HAVE_VULKAN

gfx/drivers_context/drm_ctx.c

@@ -234,7 +234,7 @@ static void gfx_ctx_drm_swap_interval(void *data, int interval)
 }
 
 static void gfx_ctx_drm_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
+      bool *resize, unsigned *width, unsigned *height)
 {
    (void)data;
    (void)width;

gfx/drivers_context/emscriptenegl_ctx.c

@@ -91,7 +91,7 @@ static void gfx_ctx_emscripten_get_canvas_size(int *width, int *height)
 }
 
 static void gfx_ctx_emscripten_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
+      bool *resize, unsigned *width, unsigned *height)
 {
    EMSCRIPTEN_RESULT r;
    int input_width;

gfx/drivers_context/fpga_ctx.c

@@ -36,7 +36,7 @@ static unsigned g_resize_width  = FB_WIDTH;
 static unsigned g_resize_height = FB_HEIGHT;
 
 static void gfx_ctx_fpga_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
+      bool *resize, unsigned *width, unsigned *height)
 {
 }
 

gfx/drivers_context/gdi_ctx.c

@@ -57,7 +57,7 @@ typedef struct gfx_ctx_gdi_data
 void *dinput_gdi;
 
 static void gfx_ctx_gdi_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
+      bool *resize, unsigned *width, unsigned *height)
 {
    win32_check_window(quit, resize, width, height);
 }

gfx/drivers_context/gfx_null_ctx.c

@@ -25,7 +25,7 @@ static void gfx_ctx_null_swap_interval(void *data, int interval)
 }
 
 static void gfx_ctx_null_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
+      bool *resize, unsigned *width, unsigned *height)
 {
    (void)data;
    (void)quit;

gfx/drivers_context/khr_display_ctx.c

@@ -81,7 +81,7 @@ error:
 }
 
 static void gfx_ctx_khr_display_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
+      bool *resize, unsigned *width, unsigned *height)
 {
    khr_display_ctx_data_t *khr = (khr_display_ctx_data_t*)data;
 
@@ -94,7 +94,7 @@ static void gfx_ctx_khr_display_check_window(void *data, bool *quit,
       *resize = true;
    }
 
-   if (is_shutdown || (bool)frontend_driver_get_signal_handler_state())
+   if ((bool)frontend_driver_get_signal_handler_state())
       *quit = true;
 }
 

gfx/drivers_context/mali_fbdev_ctx.c

@@ -134,7 +134,7 @@ error:
 }
 
 static void gfx_ctx_mali_fbdev_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
+      bool *resize, unsigned *width, unsigned *height)
 {
    unsigned new_width, new_height;
 

gfx/drivers_context/network_ctx.c

@@ -34,7 +34,7 @@
 static enum gfx_ctx_api network_ctx_api = GFX_CTX_NONE;
 
 static void gfx_ctx_network_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
+      bool *resize, unsigned *width, unsigned *height)
 {
 }
 

gfx/drivers_context/opendingux_fbdev_ctx.c

@@ -113,7 +113,7 @@ static void gfx_ctx_opendingux_get_video_size(void *data,
 }
 
 static void gfx_ctx_opendingux_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
+      bool *resize, unsigned *width, unsigned *height)
 {
    unsigned new_width, new_height;
    opendingux_ctx_data_t *viv = (opendingux_ctx_data_t*)data;

gfx/drivers_context/orbis_ctx.c

@@ -124,7 +124,7 @@ error:
 }
 
 static void orbis_ctx_check_window(void *data, bool *quit,
-                                    bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
+      bool *resize, unsigned *width, unsigned *height)
 {
     unsigned new_width, new_height;
 

gfx/drivers_context/osmesa_ctx.c

@@ -317,7 +317,7 @@ static void osmesa_ctx_get_video_size(void *data,
 
 static void osmesa_ctx_check_window(void *data, bool *quit,
       bool *resize,unsigned *width,
-      unsigned *height, bool is_shutdown)
+      unsigned *height)
 {
    gfx_ctx_osmesa_data_t *osmesa = (gfx_ctx_osmesa_data_t*)data;
 

gfx/drivers_context/ps3_ctx.c

@@ -149,8 +149,7 @@ static void gfx_ctx_ps3_set_swap_interval(void *data, int interval)
 }
 
 static void gfx_ctx_ps3_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height,
+      bool *resize, unsigned *width, unsigned *height)
-      bool is_shutdown)
 {
    gl_t *gl = data;
 

gfx/drivers_context/qnx_ctx.c

@@ -278,8 +278,7 @@ static void gfx_ctx_qnx_get_video_size(void *data,
 }
 
 static void gfx_ctx_qnx_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height,
+      bool *resize, unsigned *width, unsigned *height)
-      bool is_shutdown)
 {
    unsigned new_width, new_height;
    qnx_ctx_data_t *qnx = (qnx_ctx_data_t*)data;
@@ -296,10 +295,6 @@ static void gfx_ctx_qnx_check_window(void *data, bool *quit,
       *height = new_height;
       *resize = true;
    }
-
-   /* Check if we are exiting. */
-   if (is_shutdown)
-      *quit = true;
 }
 
 static bool gfx_ctx_qnx_set_video_mode(void *data,

gfx/drivers_context/sdl_gl_ctx.c

@@ -304,8 +304,7 @@ static void sdl_ctx_update_title(void *data, void *data2)
 
 static void sdl_ctx_check_window(void *data, bool *quit,
       bool *resize,unsigned *width,
-      unsigned *height,
+      unsigned *height)
-      bool is_shutdown)
 {
    SDL_Event event;
    gfx_ctx_sdl_data_t *sdl = (gfx_ctx_sdl_data_t*)data;

gfx/drivers_context/sixel_ctx.c

@@ -34,7 +34,7 @@
 static enum gfx_ctx_api sixel_ctx_api = GFX_CTX_NONE;
 
 static void gfx_ctx_sixel_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
+      bool *resize, unsigned *width, unsigned *height)
 {
 }
 

gfx/drivers_context/switch_ctx.c

@@ -120,7 +120,7 @@ error:
 }
 
 static void switch_ctx_check_window(void *data, bool *quit,
-                                    bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
+      bool *resize, unsigned *width, unsigned *height)
 {
     unsigned new_width, new_height;
 

gfx/drivers_context/uwp_egl_ctx.c

@@ -138,8 +138,7 @@ static void gfx_ctx_uwp_swap_interval(void *data, int interval)
 }
 
 static void gfx_ctx_uwp_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height,
+      bool *resize, unsigned *width, unsigned *height)
-      bool is_shutdown)
 {
    win32_check_window(quit, resize, width, height);
 }

gfx/drivers_context/vc_egl_ctx.c

@@ -91,13 +91,8 @@ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char
 }
 
 static void gfx_ctx_vc_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height,
+      bool *resize, unsigned *width, unsigned *height)
-      bool is_shutdown)
 {
-   (void)data;
-   (void)width;
-   (void)height;
-
    *resize = false;
    *quit   = (bool)frontend_driver_get_signal_handler_state();
 }

gfx/drivers_context/vita_ctx.c

@@ -32,7 +32,7 @@ static void vita_get_video_size(void *data, unsigned *width, unsigned *height)
 }
 
 static void vita_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height, bool is_shutdown)
+      bool *resize, unsigned *width, unsigned *height)
 {
    unsigned new_width, new_height;
 

gfx/drivers_context/vivante_fbdev_ctx.c

@@ -118,8 +118,7 @@ static void gfx_ctx_vivante_get_video_size(void *data,
 }
 
 static void gfx_ctx_vivante_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height,
+      bool *resize, unsigned *width, unsigned *height)
-      bool is_shutdown)
 {
    unsigned new_width, new_height;
    vivante_ctx_data_t *viv = (vivante_ctx_data_t*)data;

gfx/drivers_context/wayland_ctx.c

@@ -1068,8 +1068,7 @@ void flush_wayland_fd(void *data)
 }
 
 static void gfx_ctx_wl_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height,
+      bool *resize, unsigned *width, unsigned *height)
-      bool is_shutdown)
 {
    /* this function works with SCALED sizes, it's used from the renderer */
    unsigned new_width, new_height;

gfx/drivers_context/wgl_ctx.c

@@ -517,8 +517,7 @@ static void gfx_ctx_wgl_swap_interval(void *data, int interval)
 }
 
 static void gfx_ctx_wgl_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height,
+      bool *resize, unsigned *width, unsigned *height)
-      bool is_shutdown)
 {
    win32_check_window(quit, resize, width, height);
 

gfx/drivers_context/x_ctx.c

@@ -399,11 +399,9 @@ static void gfx_ctx_x_swap_buffers(void *data, void *data2)
 }
 
 static void gfx_ctx_x_check_window(void *data, bool *quit,
-      bool *resize, unsigned *width, unsigned *height,
+      bool *resize, unsigned *width, unsigned *height)
-      bool is_shutdown)
 {
-   x11_check_window(data, quit, resize, width, height,
+   x11_check_window(data, quit, resize, width, height);
-         is_shutdown);
 
    switch (x_api)
    {
@@ -1019,10 +1017,8 @@ static bool gfx_ctx_x_set_video_mode(void *data,
 #ifdef HAVE_VULKAN
          {
             bool quit, resize;
-            bool shutdown = false;
             unsigned width = 0, height = 0;
-            x11_check_window(x, &quit, &resize, &width, &height,
+            x11_check_window(x, &quit, &resize, &width, &height);
-                  shutdown);
 
             /* FIXME/TODO - threading error here */
 

retroarch.h

@@ -1252,7 +1252,7 @@ typedef struct gfx_ctx_driver
    /* Queries for resize and quit events.
     * Also processes events. */
    void (*check_window)(void*, bool*, bool*,
-         unsigned*, unsigned*, bool);
+         unsigned*, unsigned*);
 
    /* Acknowledge a resize event. This is needed for some APIs.
     * Most backends will ignore this. */