From 718d65d95d4eab60f332d16e003cf36f8544a310 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 29 Aug 2019 12:30:56 +0200
Subject: [PATCH] Take this out - too unsafe - fixes D3D12 driver

---
 gfx/common/win32_common.c          |  4 ----
 gfx/common/x11_common.c            |  3 ---
 gfx/drivers_context/cocoa_gl_ctx.m |  4 ----
 gfx/drivers_context/wayland_ctx.c  |  4 ----
 retroarch.c                        | 16 ----------------
 retroarch.h                        |  1 -
 6 files changed, 32 deletions(-)

diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index 4599df9b6f..50f76678b0 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -1109,10 +1109,6 @@ void win32_check_window(bool *quit, bool *resize,
       *width              = g_win32_resize_width;
       *height             = g_win32_resize_height;
       g_win32_resized     = false;
-
-#ifdef HAVE_MENU
-      rarch_ctl(RARCH_CTL_SET_DEFERRED_MENU_CONTEXT_RESET, NULL);
-#endif
    }
 #endif
 }
diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c
index b6b77b78b3..6f59827cdb 100644
--- a/gfx/common/x11_common.c
+++ b/gfx/common/x11_common.c
@@ -609,9 +609,6 @@ void x11_check_window(void *data, bool *quit,
       *width  = new_width;
       *height = new_height;
       *resize = true;
-#ifdef HAVE_MENU
-      rarch_ctl(RARCH_CTL_SET_DEFERRED_MENU_CONTEXT_RESET, NULL);
-#endif
    }
 
    x11_alive(data);
diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m
index df81200e39..40c2363f9d 100644
--- a/gfx/drivers_context/cocoa_gl_ctx.m
+++ b/gfx/drivers_context/cocoa_gl_ctx.m
@@ -558,10 +558,6 @@ static void cocoagl_gfx_ctx_check_window(void *data, bool *quit,
       *width  = new_width;
       *height = new_height;
       *resize = true;
-       
-#ifdef HAVE_MENU
-      rarch_ctl(RARCH_CTL_SET_DEFERRED_MENU_CONTEXT_RESET, NULL);
-#endif
    }
 }
 
diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c
index 661cd50065..a5d787c9ed 100644
--- a/gfx/drivers_context/wayland_ctx.c
+++ b/gfx/drivers_context/wayland_ctx.c
@@ -1102,10 +1102,6 @@ static void gfx_ctx_wl_check_window(void *data, bool *quit,
       *height = new_height;
       *resize = true;
 
-#ifdef HAVE_MENU
-      rarch_ctl(RARCH_CTL_SET_DEFERRED_MENU_CONTEXT_RESET, NULL);
-#endif
-
       wl->last_buffer_scale = wl->buffer_scale;
    }
 
diff --git a/retroarch.c b/retroarch.c
index b2732d5e0a..5cc510d028 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -849,9 +849,6 @@ static retro_keyboard_event_t runloop_key_event                 = NULL;
 static retro_keyboard_event_t runloop_frontend_key_event        = NULL;
 static core_option_manager_t *runloop_core_options              = NULL;
 static msg_queue_t *runloop_msg_queue                           = NULL;
-#ifdef HAVE_MENU
-static bool runloop_set_deferred_menu_context_reset             = false;
-#endif
 
 static unsigned runloop_pending_windowed_scale                  = 0;
 static unsigned runloop_max_frames                              = 0;
@@ -22959,11 +22956,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
 {
    switch(state)
    {
-      case RARCH_CTL_SET_DEFERRED_MENU_CONTEXT_RESET:
-#ifdef HAVE_MENU
-         runloop_set_deferred_menu_context_reset = true;
-#endif
-         break;
       case RARCH_CTL_CORE_IS_RUNNING:
          return runloop_core_running;
       case RARCH_CTL_BSV_MOVIE_IS_INITED:
@@ -24300,14 +24292,6 @@ static enum runloop_state runloop_check_state(void)
 
          if (menu_data)
          {
-            if (runloop_set_deferred_menu_context_reset)
-            {
-               if (menu_data->driver_ctx && menu_data->driver_ctx->context_reset)
-                  menu_data->driver_ctx->context_reset(menu_data->userdata, video_driver_is_threaded_internal());
-               video_driver_frame_count                = 0;
-               runloop_set_deferred_menu_context_reset = false;
-            }
-
             if (BIT64_GET(menu_data->state, MENU_STATE_RENDER_FRAMEBUFFER)
                   != BIT64_GET(menu_data->state, MENU_STATE_RENDER_MESSAGEBOX))
                BIT64_SET(menu_data->state, MENU_STATE_RENDER_FRAMEBUFFER);
diff --git a/retroarch.h b/retroarch.h
index d0436bff91..8d7ccbc85a 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -175,7 +175,6 @@ enum rarch_ctl_state
    RARCH_CTL_CORE_OPTIONS_DEINIT,
    RARCH_CTL_CORE_OPTIONS_DISPLAY,
    RARCH_CTL_CORE_IS_RUNNING,
-   RARCH_CTL_SET_DEFERRED_MENU_CONTEXT_RESET,
 
    /* BSV Movie */
    RARCH_CTL_BSV_MOVIE_IS_INITED