mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 13:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass video_is_threaded to context_reset

Browse Source
This commit is contained in:
twinaphex 2017-04-29 17:16:05 +02:00
parent 6f0df4cf60
commit b515cd10f1
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/drivers/materialui.c
View File

@ -1407,7 +1407,7 @@ static void mui_frame(void *data, video_frame_info_t *video_info)
menu_display_unset_viewport(video_info->width, video_info->height); menu_display_unset_viewport(video_info->width, video_info->height);
} }
static void mui_layout(mui_handle_t *mui) static void mui_layout(mui_handle_t *mui, bool video_is_threaded)
{ {
float scale_factor; float scale_factor;
int new_font_size, new_font_size2; int new_font_size, new_font_size2;
@ -1629,7 +1629,7 @@ static void mui_populate_entries(
mui->scroll_y = mui_get_scroll(mui); mui->scroll_y = mui_get_scroll(mui);
} }
static void mui_context_reset(void *data) static void mui_context_reset(void *data, bool is_threaded)
{ {
mui_handle_t *mui = (mui_handle_t*)data; mui_handle_t *mui = (mui_handle_t*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -1637,7 +1637,7 @@ static void mui_context_reset(void *data)
if (!mui || !settings) if (!mui || !settings)
return; return;
mui_layout(mui); mui_layout(mui, is_threaded);
mui_context_bg_destroy(mui); mui_context_bg_destroy(mui);
menu_display_allocate_white_texture(); menu_display_allocate_white_texture();
mui_context_reset_textures(mui); mui_context_reset_textures(mui);

2
menu/drivers/nuklear.c
View File

@ -419,7 +419,7 @@ static void nk_menu_context_load_textures(nk_menu_handle_t *nk,
} }
} }
static void nk_menu_context_reset(void *data) static void nk_menu_context_reset(void *data, bool is_threaded)
{ {
char iconpath[PATH_MAX_LENGTH] = {0}; char iconpath[PATH_MAX_LENGTH] = {0};
nk_menu_handle_t *nk = (nk_menu_handle_t*)data; nk_menu_handle_t *nk = (nk_menu_handle_t*)data;

2
menu/drivers/xmb.c
View File

@ -3533,7 +3533,7 @@ static void xmb_context_reset_background(const char *iconpath)
menu_display_handle_wallpaper_upload, NULL); menu_display_handle_wallpaper_upload, NULL);
} }
static void xmb_context_reset(void *data) static void xmb_context_reset(void *data, bool is_threaded)
{ {
char iconpath[PATH_MAX_LENGTH]; char iconpath[PATH_MAX_LENGTH];
xmb_handle_t *xmb = (xmb_handle_t*)data; xmb_handle_t *xmb = (xmb_handle_t*)data;

2
menu/drivers/zarch.c
View File

@ -1081,7 +1081,7 @@ static bool zarch_load_image(void *userdata,
return true; return true;
} }
static void zarch_context_reset(void *data) static void zarch_context_reset(void *data, bool is_threaded)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
zui_t *zui = (zui_t*)data; zui_t *zui = (zui_t*)data;

4
menu/menu_driver.c
View File

@ -458,11 +458,11 @@ void menu_driver_decrement_navigation(void)
menu_driver_ctx->navigation_decrement(menu_userdata); menu_driver_ctx->navigation_decrement(menu_userdata);
} }
bool menu_driver_context_reset(bool is_threaded) bool menu_driver_context_reset(bool video_is_threaded)
{ {
if (!menu_driver_ctx || !menu_driver_ctx->context_reset) if (!menu_driver_ctx || !menu_driver_ctx->context_reset)
return false; return false;
menu_driver_ctx->context_reset(menu_userdata); menu_driver_ctx->context_reset(menu_userdata, video_is_threaded);
return true; return true;
} }

2
menu/menu_driver.h
View File

@ -231,7 +231,7 @@ typedef struct menu_ctx_driver
void (*frame)(void *data, video_frame_info_t *video_info); void (*frame)(void *data, video_frame_info_t *video_info);
void* (*init)(void**); void* (*init)(void**);
void (*free)(void*); void (*free)(void*);
void (*context_reset)(void *data); void (*context_reset)(void *data, bool video_is_threaded);
void (*context_destroy)(void *data); void (*context_destroy)(void *data);
void (*populate_entries)(void *data, void (*populate_entries)(void *data,
const char *path, const char *label, const char *path, const char *label,