From 453cc3dcbd38daf44bbdd4d2a2eb8809df76f9a7 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 26 Jul 2019 06:23:20 +0200
Subject: [PATCH] (video context driver) has_Windowed can be degraded to a
 simple boolean variable

---
 gfx/drivers_context/android_ctx.c          |  2 +-
 gfx/drivers_context/cgl_ctx.c              |  2 +-
 gfx/drivers_context/cocoa_gl_ctx.m         | 11 ++---------
 gfx/drivers_context/drm_ctx.c              |  2 +-
 gfx/drivers_context/emscriptenegl_ctx.c    | 10 +---------
 gfx/drivers_context/gdi_ctx.c              |  9 +--------
 gfx/drivers_context/gfx_null_ctx.c         |  2 +-
 gfx/drivers_context/khr_display_ctx.c      |  2 +-
 gfx/drivers_context/mali_fbdev_ctx.c       |  2 +-
 gfx/drivers_context/opendingux_fbdev_ctx.c |  2 +-
 gfx/drivers_context/orbis_ctx.c            |  2 +-
 gfx/drivers_context/osmesa_ctx.c           |  8 +-------
 gfx/drivers_context/ps3_ctx.c              |  2 +-
 gfx/drivers_context/qnx_ctx.c              |  2 +-
 gfx/drivers_context/sdl_gl_ctx.c           |  8 +-------
 gfx/drivers_context/sixel_ctx.c            |  9 +--------
 gfx/drivers_context/switch_ctx.c           |  2 +-
 gfx/drivers_context/vc_egl_ctx.c           |  2 +-
 gfx/drivers_context/vivante_fbdev_ctx.c    |  2 +-
 gfx/drivers_context/wayland_ctx.c          |  8 +-------
 gfx/drivers_context/wgl_ctx.c              |  9 +--------
 gfx/drivers_context/x_ctx.c                |  8 +-------
 gfx/drivers_context/xegl_ctx.c             | 10 +---------
 retroarch.c                                |  4 ++--
 retroarch.h                                |  2 +-
 25 files changed, 27 insertions(+), 95 deletions(-)

diff --git a/gfx/drivers_context/android_ctx.c b/gfx/drivers_context/android_ctx.c
index 98cad61561..2febf814ec 100644
--- a/gfx/drivers_context/android_ctx.c
+++ b/gfx/drivers_context/android_ctx.c
@@ -654,7 +654,7 @@ const gfx_ctx_driver_t gfx_ctx_android = {
    android_gfx_ctx_set_resize,
    android_gfx_ctx_has_focus,
    android_gfx_ctx_suppress_screensaver,
-   NULL, /* has_windowed */
+   false, /* has_windowed */
    android_gfx_ctx_swap_buffers,
    android_gfx_ctx_input_driver,
    android_gfx_ctx_get_proc_address,
diff --git a/gfx/drivers_context/cgl_ctx.c b/gfx/drivers_context/cgl_ctx.c
index 972093c5f9..4c8d6fdd89 100644
--- a/gfx/drivers_context/cgl_ctx.c
+++ b/gfx/drivers_context/cgl_ctx.c
@@ -367,7 +367,7 @@ const gfx_ctx_driver_t gfx_ctx_cgl = {
    NULL, /* set_resize */
    gfx_ctx_cgl_has_focus,
    gfx_ctx_cgl_suppress_screensaver,
-   NULL, /* has_windowed */
+   false, /* has_windowed */
    gfx_ctx_cgl_swap_buffers,
    gfx_ctx_cgl_input_driver,
    gfx_ctx_cgl_get_proc_address,
diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m
index b12b55b367..b63b507d61 100644
--- a/gfx/drivers_context/cocoa_gl_ctx.m
+++ b/gfx/drivers_context/cocoa_gl_ctx.m
@@ -454,13 +454,6 @@ static bool cocoagl_gfx_ctx_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-#if !defined(HAVE_COCOATOUCH)
-static bool cocoagl_gfx_ctx_has_windowed(void *data)
-{
-   return true;
-}
-#endif
-
 static void cocoagl_gfx_ctx_input_driver(void *data,
       const char *name,
       const input_driver_t **input, void **input_data)
@@ -918,9 +911,9 @@ const gfx_ctx_driver_t gfx_ctx_cocoagl = {
    cocoagl_gfx_ctx_has_focus,
    cocoagl_gfx_ctx_suppress_screensaver,
 #if defined(HAVE_COCOATOUCH)
-   NULL,
+   false,
 #else
-   cocoagl_gfx_ctx_has_windowed,
+   true,
 #endif
    cocoagl_gfx_ctx_swap_buffers,
    cocoagl_gfx_ctx_input_driver,
diff --git a/gfx/drivers_context/drm_ctx.c b/gfx/drivers_context/drm_ctx.c
index b935d9cfb0..2f2230db2c 100644
--- a/gfx/drivers_context/drm_ctx.c
+++ b/gfx/drivers_context/drm_ctx.c
@@ -967,7 +967,7 @@ const gfx_ctx_driver_t gfx_ctx_drm = {
    NULL, /* set_resize */
    gfx_ctx_drm_has_focus,
    gfx_ctx_drm_suppress_screensaver,
-   NULL, /* has_windowed */
+   false, /* has_windowed */
    gfx_ctx_drm_swap_buffers,
    gfx_ctx_drm_input_driver,
    gfx_ctx_drm_get_proc_address,
diff --git a/gfx/drivers_context/emscriptenegl_ctx.c b/gfx/drivers_context/emscriptenegl_ctx.c
index 40bb51b5a5..6ad0b6cc89 100644
--- a/gfx/drivers_context/emscriptenegl_ctx.c
+++ b/gfx/drivers_context/emscriptenegl_ctx.c
@@ -306,14 +306,6 @@ static bool gfx_ctx_emscripten_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static bool gfx_ctx_emscripten_has_windowed(void *data)
-{
-   (void)data;
-
-   /* TODO -verify. */
-   return true;
-}
-
 static float gfx_ctx_emscripten_translate_aspect(void *data,
       unsigned width, unsigned height)
 {
@@ -387,7 +379,7 @@ const gfx_ctx_driver_t gfx_ctx_emscripten = {
    NULL, /* set_resize */
    gfx_ctx_emscripten_has_focus,
    gfx_ctx_emscripten_suppress_screensaver,
-   gfx_ctx_emscripten_has_windowed,
+   false,
    gfx_ctx_emscripten_swap_buffers,
    gfx_ctx_emscripten_input_driver,
    gfx_ctx_emscripten_get_proc_address,
diff --git a/gfx/drivers_context/gdi_ctx.c b/gfx/drivers_context/gdi_ctx.c
index 04782b1165..d68f298250 100644
--- a/gfx/drivers_context/gdi_ctx.c
+++ b/gfx/drivers_context/gdi_ctx.c
@@ -288,13 +288,6 @@ static bool gfx_ctx_gdi_suppress_screensaver(void *data, bool enable)
    return win32_suppress_screensaver(data, enable);
 }
 
-static bool gfx_ctx_gdi_has_windowed(void *data)
-{
-   (void)data;
-
-   return true;
-}
-
 static bool gfx_ctx_gdi_get_metrics(void *data,
 	enum display_metric_types type, float *value)
 {
@@ -379,7 +372,7 @@ const gfx_ctx_driver_t gfx_ctx_gdi = {
    gfx_ctx_gdi_set_resize,
    gfx_ctx_gdi_has_focus,
    gfx_ctx_gdi_suppress_screensaver,
-   gfx_ctx_gdi_has_windowed,
+   true, /* has_windowed */
    gfx_ctx_gdi_swap_buffers,
    gfx_ctx_gdi_input_driver,
    NULL,
diff --git a/gfx/drivers_context/gfx_null_ctx.c b/gfx/drivers_context/gfx_null_ctx.c
index f9b898c870..c616e31f74 100644
--- a/gfx/drivers_context/gfx_null_ctx.c
+++ b/gfx/drivers_context/gfx_null_ctx.c
@@ -151,7 +151,7 @@ const gfx_ctx_driver_t gfx_ctx_null = {
    NULL, /* set_resize */
    gfx_ctx_null_has_focus,
    gfx_ctx_null_suppress_screensaver,
-   NULL, /* has_windowed */
+   false, /* has_windowed */
    gfx_ctx_null_swap_buffers,
    gfx_ctx_null_input_driver,
    NULL,
diff --git a/gfx/drivers_context/khr_display_ctx.c b/gfx/drivers_context/khr_display_ctx.c
index bf99de8ac4..ad0ec0618c 100644
--- a/gfx/drivers_context/khr_display_ctx.c
+++ b/gfx/drivers_context/khr_display_ctx.c
@@ -315,7 +315,7 @@ const gfx_ctx_driver_t gfx_ctx_khr_display = {
    gfx_ctx_khr_display_set_resize,
    gfx_ctx_khr_display_has_focus,
    gfx_ctx_khr_display_suppress_screensaver,
-   NULL, /* has_windowed */
+   false, /* has_windowed */
    gfx_ctx_khr_display_swap_buffers,
    gfx_ctx_khr_display_input_driver,
    gfx_ctx_khr_display_get_proc_address,
diff --git a/gfx/drivers_context/mali_fbdev_ctx.c b/gfx/drivers_context/mali_fbdev_ctx.c
index ddb0ef845e..ef1ccb32bc 100644
--- a/gfx/drivers_context/mali_fbdev_ctx.c
+++ b/gfx/drivers_context/mali_fbdev_ctx.c
@@ -344,7 +344,7 @@ const gfx_ctx_driver_t gfx_ctx_mali_fbdev = {
    NULL, /* set_resize */
    gfx_ctx_mali_fbdev_has_focus,
    gfx_ctx_mali_fbdev_suppress_screensaver,
-   NULL, /* has_windowed */
+   false, /* has_windowed */
    gfx_ctx_mali_fbdev_swap_buffers,
    gfx_ctx_mali_fbdev_input_driver,
    gfx_ctx_mali_fbdev_get_proc_address,
diff --git a/gfx/drivers_context/opendingux_fbdev_ctx.c b/gfx/drivers_context/opendingux_fbdev_ctx.c
index 86bb3b6775..fbd7b4359c 100644
--- a/gfx/drivers_context/opendingux_fbdev_ctx.c
+++ b/gfx/drivers_context/opendingux_fbdev_ctx.c
@@ -284,7 +284,7 @@ const gfx_ctx_driver_t gfx_ctx_opendingux_fbdev = {
    NULL, /* set_resize */
    gfx_ctx_opendingux_has_focus,
    gfx_ctx_opendingux_suppress_screensaver,
-   NULL, /* has_windowed */
+   false, /* has_windowed */
    gfx_ctx_opendingux_swap_buffers,
    gfx_ctx_opendingux_input_driver,
    gfx_ctx_opendingux_get_proc_address,
diff --git a/gfx/drivers_context/orbis_ctx.c b/gfx/drivers_context/orbis_ctx.c
index 89266e6221..cce318a752 100644
--- a/gfx/drivers_context/orbis_ctx.c
+++ b/gfx/drivers_context/orbis_ctx.c
@@ -326,7 +326,7 @@ const gfx_ctx_driver_t orbis_ctx = {
     NULL, /* set_resize */
     orbis_ctx_has_focus,
     orbis_ctx_suppress_screensaver,
-    NULL, /* has_windowed */
+    false, /* has_windowed */
     orbis_ctx_swap_buffers,
     orbis_ctx_input_driver,
     orbis_ctx_get_proc_address,
diff --git a/gfx/drivers_context/osmesa_ctx.c b/gfx/drivers_context/osmesa_ctx.c
index 76c18e9d36..aa22afc856 100644
--- a/gfx/drivers_context/osmesa_ctx.c
+++ b/gfx/drivers_context/osmesa_ctx.c
@@ -340,12 +340,6 @@ static bool osmesa_ctx_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static bool osmesa_ctx_has_windowed(void *data)
-{
-   (void)data;
-   return true;
-}
-
 static void osmesa_ctx_swap_buffers(void *data, void *data2)
 {
    gfx_ctx_osmesa_data_t *osmesa = (gfx_ctx_osmesa_data_t*)data;
@@ -410,7 +404,7 @@ const gfx_ctx_driver_t gfx_ctx_osmesa =
    NULL, /* set_resize */
    osmesa_ctx_has_focus,
    osmesa_ctx_suppress_screensaver,
-   osmesa_ctx_has_windowed,
+   true, /* has_windowed */
    osmesa_ctx_swap_buffers,
    osmesa_ctx_input_driver,
    osmesa_ctx_get_proc_address,
diff --git a/gfx/drivers_context/ps3_ctx.c b/gfx/drivers_context/ps3_ctx.c
index 9437f65b9b..6b5bdd7070 100644
--- a/gfx/drivers_context/ps3_ctx.c
+++ b/gfx/drivers_context/ps3_ctx.c
@@ -457,7 +457,7 @@ const gfx_ctx_driver_t gfx_ctx_ps3 = {
    NULL, /* set_resize */
    gfx_ctx_ps3_has_focus,
    gfx_ctx_ps3_suppress_screensaver,
-   NULL, /* has_windowed */
+   false, /* has_windowed */
    gfx_ctx_ps3_swap_buffers,
    gfx_ctx_ps3_input_driver,
    NULL,
diff --git a/gfx/drivers_context/qnx_ctx.c b/gfx/drivers_context/qnx_ctx.c
index e2c749fa6f..3e569da19c 100644
--- a/gfx/drivers_context/qnx_ctx.c
+++ b/gfx/drivers_context/qnx_ctx.c
@@ -482,7 +482,7 @@ const gfx_ctx_driver_t gfx_ctx_qnx = {
    NULL, /* set_resize */
    gfx_ctx_qnx_has_focus,
    gfx_ctx_qnx_suppress_screensaver,
-   NULL, /* has_windowed */
+   false, /* has_windowed */
    gfx_ctx_qnx_swap_buffers,
    gfx_ctx_qnx_input_driver,
    gfx_ctx_qnx_get_proc_address,
diff --git a/gfx/drivers_context/sdl_gl_ctx.c b/gfx/drivers_context/sdl_gl_ctx.c
index 42a926ca1e..c8fe1dfa92 100644
--- a/gfx/drivers_context/sdl_gl_ctx.c
+++ b/gfx/drivers_context/sdl_gl_ctx.c
@@ -366,12 +366,6 @@ static bool sdl_ctx_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static bool sdl_ctx_has_windowed(void *data)
-{
-   (void)data;
-   return true;
-}
-
 static void sdl_ctx_swap_buffers(void *data, void *data2)
 {
 #ifdef HAVE_SDL2
@@ -434,7 +428,7 @@ const gfx_ctx_driver_t gfx_ctx_sdl_gl =
    NULL, /* set_resize */
    sdl_ctx_has_focus,
    sdl_ctx_suppress_screensaver,
-   sdl_ctx_has_windowed,
+   true, /* has_windowed */
    sdl_ctx_swap_buffers,
    sdl_ctx_input_driver,
    sdl_ctx_get_proc_address,
diff --git a/gfx/drivers_context/sixel_ctx.c b/gfx/drivers_context/sixel_ctx.c
index 6fe9ecebe1..4a73a45190 100644
--- a/gfx/drivers_context/sixel_ctx.c
+++ b/gfx/drivers_context/sixel_ctx.c
@@ -135,13 +135,6 @@ static bool gfx_ctx_sixel_suppress_screensaver(void *data, bool enable)
    return true;
 }
 
-static bool gfx_ctx_sixel_has_windowed(void *data)
-{
-   (void)data;
-
-   return true;
-}
-
 static bool gfx_ctx_sixel_get_metrics(void *data,
 	enum display_metric_types type, float *value)
 {
@@ -209,7 +202,7 @@ const gfx_ctx_driver_t gfx_ctx_sixel = {
    gfx_ctx_sixel_set_resize,
    gfx_ctx_sixel_has_focus,
    gfx_ctx_sixel_suppress_screensaver,
-   gfx_ctx_sixel_has_windowed,
+   true, /* has_windowed */
    gfx_ctx_sixel_swap_buffers,
    gfx_ctx_sixel_input_driver,
    NULL,
diff --git a/gfx/drivers_context/switch_ctx.c b/gfx/drivers_context/switch_ctx.c
index f1e91d080a..51c02757b5 100644
--- a/gfx/drivers_context/switch_ctx.c
+++ b/gfx/drivers_context/switch_ctx.c
@@ -333,7 +333,7 @@ const gfx_ctx_driver_t switch_ctx = {
     NULL, /* set_resize */
     switch_ctx_has_focus,
     switch_ctx_suppress_screensaver,
-    NULL, /* has_windowed */
+    false, /* has_windowed */
     switch_ctx_swap_buffers,
     switch_ctx_input_driver,
     switch_ctx_get_proc_address,
diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
index 9fa6b64356..f88c711085 100644
--- a/gfx/drivers_context/vc_egl_ctx.c
+++ b/gfx/drivers_context/vc_egl_ctx.c
@@ -725,7 +725,7 @@ const gfx_ctx_driver_t gfx_ctx_videocore = {
    NULL, /* set_resize */
    gfx_ctx_vc_has_focus,
    gfx_ctx_vc_suppress_screensaver,
-   NULL, /* has_windowed */
+   false, /* has_windowed */
    gfx_ctx_vc_swap_buffers,
    gfx_ctx_vc_input_driver,
    gfx_ctx_vc_get_proc_address,
diff --git a/gfx/drivers_context/vivante_fbdev_ctx.c b/gfx/drivers_context/vivante_fbdev_ctx.c
index b32521eda5..a140c2d40d 100644
--- a/gfx/drivers_context/vivante_fbdev_ctx.c
+++ b/gfx/drivers_context/vivante_fbdev_ctx.c
@@ -291,7 +291,7 @@ const gfx_ctx_driver_t gfx_ctx_vivante_fbdev = {
    NULL, /* set_resize */
    gfx_ctx_vivante_has_focus,
    gfx_ctx_vivante_suppress_screensaver,
-   NULL, /* has_windowed */
+   false, /* has_windowed */
    gfx_ctx_vivante_swap_buffers,
    gfx_ctx_vivante_input_driver,
    gfx_ctx_vivante_get_proc_address,
diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c
index fd0d48efea..04fa809ac2 100644
--- a/gfx/drivers_context/wayland_ctx.c
+++ b/gfx/drivers_context/wayland_ctx.c
@@ -1818,12 +1818,6 @@ static bool gfx_ctx_wl_suppress_screensaver(void *data, bool state)
     return true;
 }
 
-static bool gfx_ctx_wl_has_windowed(void *data)
-{
-   (void)data;
-   return true;
-}
-
 static enum gfx_ctx_api gfx_ctx_wl_get_api(void *data)
 {
    return wl_api;
@@ -2053,7 +2047,7 @@ const gfx_ctx_driver_t gfx_ctx_wayland = {
    gfx_ctx_wl_set_resize,
    gfx_ctx_wl_has_focus,
    gfx_ctx_wl_suppress_screensaver,
-   gfx_ctx_wl_has_windowed,
+   true, /* has_windowed */
    gfx_ctx_wl_swap_buffers,
    gfx_ctx_wl_input_driver,
    gfx_ctx_wl_get_proc_address,
diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c
index 0b7fae942d..aec0cde116 100644
--- a/gfx/drivers_context/wgl_ctx.c
+++ b/gfx/drivers_context/wgl_ctx.c
@@ -724,13 +724,6 @@ static bool gfx_ctx_wgl_suppress_screensaver(void *data, bool enable)
    return win32_suppress_screensaver(data, enable);
 }
 
-static bool gfx_ctx_wgl_has_windowed(void *data)
-{
-   (void)data;
-
-   return true;
-}
-
 static bool gfx_ctx_wgl_get_metrics(void *data,
 	enum display_metric_types type, float *value)
 {
@@ -894,7 +887,7 @@ const gfx_ctx_driver_t gfx_ctx_wgl = {
    gfx_ctx_wgl_set_resize,
    gfx_ctx_wgl_has_focus,
    gfx_ctx_wgl_suppress_screensaver,
-   gfx_ctx_wgl_has_windowed,
+   true, /* has_windowed */
    gfx_ctx_wgl_swap_buffers,
    gfx_ctx_wgl_input_driver,
    gfx_ctx_wgl_get_proc_address,
diff --git a/gfx/drivers_context/x_ctx.c b/gfx/drivers_context/x_ctx.c
index cbcf1e3f79..176dc5e7ce 100644
--- a/gfx/drivers_context/x_ctx.c
+++ b/gfx/drivers_context/x_ctx.c
@@ -1028,12 +1028,6 @@ static bool gfx_ctx_x_suppress_screensaver(void *data, bool enable)
    return true;
 }
 
-static bool gfx_ctx_x_has_windowed(void *data)
-{
-   (void)data;
-   return true;
-}
-
 static gfx_ctx_proc_t gfx_ctx_x_get_proc_address(const char *symbol)
 {
    switch (x_api)
@@ -1260,7 +1254,7 @@ const gfx_ctx_driver_t gfx_ctx_x = {
    gfx_ctx_x_set_resize,
    x11_has_focus,
    gfx_ctx_x_suppress_screensaver,
-   gfx_ctx_x_has_windowed,
+   true, /* has_windowed */
    gfx_ctx_x_swap_buffers,
    gfx_ctx_x_input_driver,
    gfx_ctx_x_get_proc_address,
diff --git a/gfx/drivers_context/xegl_ctx.c b/gfx/drivers_context/xegl_ctx.c
index 0177c61869..6996d9e47a 100644
--- a/gfx/drivers_context/xegl_ctx.c
+++ b/gfx/drivers_context/xegl_ctx.c
@@ -476,14 +476,6 @@ static bool gfx_ctx_xegl_suppress_screensaver(void *data, bool enable)
    return true;
 }
 
-static bool gfx_ctx_xegl_has_windowed(void *data)
-{
-   (void)data;
-
-   /* TODO - verify if this has windowed mode or not. */
-   return true;
-}
-
 static enum gfx_ctx_api gfx_ctx_xegl_get_api(void *data)
 {
    return xegl_api;
@@ -646,7 +638,7 @@ const gfx_ctx_driver_t gfx_ctx_x_egl =
    NULL, /* set_resize */
    x11_has_focus,
    gfx_ctx_xegl_suppress_screensaver,
-   gfx_ctx_xegl_has_windowed,
+   true, /* has_windowed */
    gfx_ctx_xegl_swap_buffers,
    gfx_ctx_xegl_input_driver,
    gfx_ctx_xegl_get_proc_address,
diff --git a/retroarch.c b/retroarch.c
index bb761eeae0..96da270fc9 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -18982,8 +18982,8 @@ bool video_driver_has_windowed(void)
 #if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE))
    if (video_driver_data && current_video->has_windowed)
       return current_video->has_windowed(video_driver_data);
-   else if (video_context_data && current_video_context.has_windowed)
-      return current_video_context.has_windowed(video_context_data);
+   else if (video_context_data)
+      return current_video_context.has_windowed;
 #endif
    return false;
 }
diff --git a/retroarch.h b/retroarch.h
index 9b4687fb66..cd0c053fac 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -1282,7 +1282,7 @@ typedef struct gfx_ctx_driver
    bool (*suppress_screensaver)(void *data, bool enable);
 
    /* Checks if context driver has windowed support. */
-   bool (*has_windowed)(void*);
+   bool has_windowed;
 
    /* Swaps buffers. VBlank sync depends on
     * earlier calls to swap_interval. */