Create GFX_CTL_CHECK_WINDOW

gfx/d3d/d3d.cpp

@@ -841,14 +841,20 @@ static void d3d_set_nonblock_state(void *data, bool state)
 
 static bool d3d_alive(void *data)
 {
-   unsigned temp_width = 0, temp_height = 0;
+   gfx_ctx_size_t size_data;
-   bool ret = false;
+   unsigned temp_width  = 0;
-   d3d_video_t *d3d   = (d3d_video_t*)data;
+   unsigned temp_height = 0;
-   bool        quit   = false;
+   bool ret             = false;
-   bool        resize = false;
+   d3d_video_t *d3d     = (d3d_video_t*)data;
+   bool        quit     = false;
+   bool        resize   = false;
 
-   if (gfx_ctx_check_window(&quit, &resize,
+   size_data.quit       = &quit;
-            &temp_width, &temp_height))
+   size_data.resize     = &resize;
+   size_data.width      = &temp_width;
+   size_data.height     = &temp_height;
+
+   if (gfx_ctx_ctl(GFX_CTL_CHECK_WINDOW, &size_data))
    {
       if (quit)
          d3d->quitting = quit;

gfx/drivers/gl.c

@@ -2675,16 +2675,23 @@ error:
 
 static bool gl_alive(void *data)
 {
-   unsigned temp_width = 0, temp_height = 0;
+   gfx_ctx_size_t size_data;
-   bool ret = false;
+   unsigned temp_width  = 0;
-   bool quit = false, resize = false;
+   unsigned temp_height = 0;
-   gl_t         *gl = (gl_t*)data;
+   bool ret             = false;
+   bool quit            = false;
+   bool resize          = false;
+   gl_t         *gl     = (gl_t*)data;
 
    /* Needed because some context drivers don't track their sizes */
    video_driver_get_size(&temp_width, &temp_height);
 
-   if (gfx_ctx_check_window(&quit,
+   size_data.quit       = &quit;
-            &resize, &temp_width, &temp_height))
+   size_data.resize     = &resize;
+   size_data.width      = &temp_width;
+   size_data.height     = &temp_height;
+
+   if (gfx_ctx_ctl(GFX_CTL_CHECK_WINDOW, &size_data))
    {
       if (quit)
          gl->quitting = true;

gfx/drivers/vg.c

@@ -359,12 +359,18 @@ static bool vg_frame(void *data, const void *frame,
 
 static bool vg_alive(void *data)
 {
-   bool quit;
+   gfx_ctx_size_t size_data;
-   unsigned temp_width = 0, temp_height = 0;
+   bool quit            = false;
-   vg_t            *vg = (vg_t*)data;
+   unsigned temp_width  = 0;
+   unsigned temp_height = 0;
+   vg_t            *vg  = (vg_t*)data;
 
-   gfx_ctx_check_window(&quit,
+   size_data.quit       = &quit;
-         &vg->should_resize, &temp_width, &temp_height);
+   size_data.resize     = &vg->should_resize;
+   size_data.width      = &temp_width;
+   size_data.height     = &temp_height;
+
+   gfx_ctx_ctl(GFX_CTL_CHECK_WINDOW, &size_data);
 
    if (temp_width != 0 && temp_height != 0)
       video_driver_set_size(&temp_width, &temp_height);

gfx/video_context_driver.c

@@ -137,22 +137,6 @@ retro_proc_address_t gfx_ctx_get_proc_address(const char *sym)
    return current_video_context->get_proc_address(sym);
 }
 
-bool gfx_ctx_check_window(bool *quit, bool *resize,
-      unsigned *width, unsigned *height)
-{
-   uint64_t       *frame_count;
-   
-   video_driver_ctl(RARCH_DISPLAY_CTL_GET_FRAME_COUNT, &frame_count);
-
-   if (!video_context_data)
-      return false;
-   
-   current_video_context->check_window(video_context_data, quit,
-         resize, width, height, (unsigned int)*frame_count);
-
-   return true;
-}
-
 bool gfx_ctx_suppress_screensaver(bool enable)
 {
    if (video_context_data && current_video_context)
@@ -359,6 +343,23 @@ bool gfx_ctx_ctl(enum gfx_ctx_ctl_state state, void *data)
 {
    switch (state)
    {
+      case GFX_CTL_CHECK_WINDOW:
+         {
+            uint64_t       *frame_count = NULL;
+            gfx_ctx_size_t *size_data   = (gfx_ctx_size_t*)data;
+
+            video_driver_ctl(RARCH_DISPLAY_CTL_GET_FRAME_COUNT, &frame_count);
+
+            if (!video_context_data)
+               return false;
+
+            current_video_context->check_window(video_context_data,
+                  size_data->quit,
+                  size_data->resize,
+                  size_data->width,
+                  size_data->height, (unsigned int)*frame_count);
+         }
+         break;
       case GFX_CTL_FIND_PREV_DRIVER:
          return gfx_ctl_find_prev_driver();
       case GFX_CTL_FIND_NEXT_DRIVER:

gfx/video_context_driver.h

@@ -54,6 +54,7 @@ enum display_metric_types
 enum gfx_ctx_ctl_state
 {
    GFX_CTL_NONE = 0,
+   GFX_CTL_CHECK_WINDOW,
    GFX_CTL_FOCUS,
    GFX_CTL_DESTROY,
    GFX_CTL_FREE,
@@ -173,6 +174,8 @@ typedef struct gfx_ctx_driver
 
 typedef struct gfx_ctx_size
 {
+   bool *quit;
+   bool *resize;
    unsigned *width;
    unsigned *height;
 } gfx_ctx_size_t;
@@ -225,9 +228,6 @@ bool gfx_ctx_image_buffer_write(const void *frame,
       unsigned width, unsigned height, unsigned pitch, bool rgb32,
       unsigned index, void **image_handle);
 
-bool gfx_ctx_check_window(bool *quit, bool *resize,
-      unsigned *width, unsigned *height);
-
 bool gfx_ctx_suppress_screensaver(bool enable);
 
 void gfx_ctx_get_video_size(unsigned *width, unsigned *height);