From 8829b27cd2196cd5828b86a468c0aab2b000a9c6 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 6 Dec 2015 18:30:45 +0100
Subject: [PATCH] Create RARCH_MENU_CTL_SET_TEXTURE

---
 menu/drivers/menu_generic.c |  2 +-
 menu/menu_driver.c          | 12 ++++--------
 menu/menu_driver.h          |  3 +--
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c
index 8dd07658e9..ae91bf79fe 100644
--- a/menu/drivers/menu_generic.c
+++ b/menu/drivers/menu_generic.c
@@ -365,7 +365,7 @@ int menu_iterate_render(void)
    if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL) && !runloop_ctl(RUNLOOP_CTL_IS_IDLE, NULL))
       menu_display_ctl(MENU_DISPLAY_CTL_LIBRETRO, NULL);
 
-   menu_driver_set_texture();
+   menu_driver_ctl(RARCH_MENU_CTL_SET_TEXTURE, NULL);
 
    menu->state               = 0;
 
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index d450c9bc25..856c892374 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -228,14 +228,6 @@ void *menu_driver_list_get_entry(menu_list_type_t type, unsigned i)
    return NULL;
 }
 
-void menu_driver_set_texture(void)
-{
-   const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
-
-   if (driver->set_texture)
-      driver->set_texture();
-}
-
 void menu_driver_context_reset(void)
 {
    const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
@@ -674,6 +666,10 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
       case RARCH_MENU_CTL_UNSET_OWN_DRIVER:
          menu_driver_data_own = false;
          break;
+      case RARCH_MENU_CTL_SET_TEXTURE:
+         if (driver->set_texture)
+            driver->set_texture();
+         break;
       case RARCH_MENU_CTL_IS_SET_TEXTURE:
          if (!menu_driver_ctx)
             return false;
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 5ef79821ce..1bfa1c8f84 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -96,6 +96,7 @@ enum rarch_menu_ctl_state
    RARCH_MENU_CTL_NONE = 0,
    RARCH_MENU_CTL_DEINIT,
    RARCH_MENU_CTL_FRAME,
+   RARCH_MENU_CTL_SET_TEXTURE,
    RARCH_MENU_CTL_SET_TOGGLE,
    RARCH_MENU_CTL_UNSET_TOGGLE,
    RARCH_MENU_CTL_SET_ALIVE,
@@ -335,8 +336,6 @@ void init_menu(void);
 
 menu_handle_t *menu_driver_get_ptr(void);
 
-void menu_driver_set_texture(void);
-
 void menu_driver_context_reset(void);
 
 void menu_driver_free(menu_handle_t *menu);