Remove menu_shader_free

mme4crt · May 23, 2016 · c72222b · c72222b
1 parent 86ef11e
commit c72222b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
@@ -545,10 +545,10 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
          menu_driver_ctl(RARCH_MENU_CTL_CONTEXT_DESTROY, NULL);
          if (menu_driver_ctl(RARCH_MENU_CTL_OWNS_DRIVER, NULL))
             return true;
+         menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_FREE, NULL);
+         menu_driver_ctl(RARCH_MENU_CTL_SHADER_DEINIT, NULL);
          if (menu_driver_data)
          {
-            menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_FREE, NULL);
-            menu_shader_free(menu_driver_data);
             menu_input_ctl(MENU_INPUT_CTL_DEINIT, NULL);
             menu_navigation_ctl(MENU_NAVIGATION_CTL_DEINIT, NULL);
 

diff --git a/menu/menu_shader.c b/menu/menu_shader.c
@@ -418,8 +418,3 @@ void menu_shader_manager_apply_changes(void)
    menu_shader_manager_set_preset(NULL, shader_type, NULL);
 #endif
 }
-
-void menu_shader_free(menu_handle_t *menu)
-{
-   menu_driver_ctl(RARCH_MENU_CTL_SHADER_DEINIT, NULL);
-}
diff --git a/menu/menu_shader.h b/menu/menu_shader.h
@@ -70,8 +70,6 @@ unsigned menu_shader_manager_get_type(
  **/
 void menu_shader_manager_apply_changes(void);
 
-void menu_shader_free(menu_handle_t *menu);
-
 #ifdef __cplusplus
 }
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,8 +70,6 @@ unsigned menu_shader_manager_get_type( @@
      **/
     void menu_shader_manager_apply_changes(void);
-    void menu_shader_free(menu_handle_t *menu);
     #ifdef __cplusplus
     }
     #endif
@@ Expand Down @@