ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Create MENU_DISPLAY_CTL_LIBRETRO

This commit is contained in:
twinaphex 2015-09-26 03:02:09 +02:00
parent 6e3c49cb64
commit 830be31c87
3 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
menu/menu_display.c
View File

@ -45,34 +45,6 @@ static menu_framebuf_t *menu_display_fb_get_ptr(void)
return &frame_buf_state;
}
/**
** menu_display_fb:
*
* Draws menu graphics onscreen.
**/
void menu_display_libretro(void)
{
settings_t *settings = config_get_ptr();
video_driver_set_texture_enable(true, false);
if (!settings->menu.pause_libretro)
{
driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr();
if (global->inited.main && (global->inited.core.type != CORE_TYPE_DUMMY))
{
bool block_libretro_input = driver->block_libretro_input;
driver->block_libretro_input = true;
pretro_run();
driver->block_libretro_input = block_libretro_input;
return;
}
}
video_driver_cached_frame();
}
static void menu_display_fb_free(menu_framebuf_t *frame_buf)
@ -218,8 +190,30 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
unsigned width, height;
menu_framebuf_t *frame_buf = menu_display_fb_get_ptr();
menu_display_t *disp = menu_display_get_ptr();
settings_t *settings = config_get_ptr();
switch (state)
{
case MENU_DISPLAY_CTL_LIBRETRO:
video_driver_set_texture_enable(true, false);
if (!settings->menu.pause_libretro)
{
driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr();
if (global->inited.main && (global->inited.core.type != CORE_TYPE_DUMMY))
{
bool block_libretro_input = driver->block_libretro_input;
driver->block_libretro_input = true;
pretro_run();
driver->block_libretro_input = block_libretro_input;
return true;
}
}
video_driver_cached_frame();
return true;
case MENU_DISPLAY_CTL_SET_WIDTH:
{
unsigned *ptr = (unsigned*)data;
@ -324,10 +318,8 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data)
return true;
case MENU_DISPLAY_CTL_GET_DPI:
{
settings_t *settings = config_get_ptr();
float *dpi = (float*)data;
*dpi = menu_dpi_override_value;
*dpi = menu_dpi_override_value;
if (!settings)
return true;

3
menu/menu_display.h
View File

@ -45,7 +45,8 @@ enum menu_display_ctl_state
MENU_DISPLAY_CTL_FB_DATA,
MENU_DISPLAY_CTL_SET_FB_DATA,
MENU_DISPLAY_CTL_FB_PITCH,
MENU_DISPLAY_CTL_SET_FB_PITCH
MENU_DISPLAY_CTL_SET_FB_PITCH,
MENU_DISPLAY_CTL_LIBRETRO
};
typedef struct menu_display

2
menu/menu_iterate.c
View File

@ -574,7 +574,7 @@ int menu_iterate_render(void)
}
if (menu_driver_alive() && !rarch_main_is_idle())
menu_display_libretro();
menu_display_ctl(MENU_DISPLAY_CTL_LIBRETRO, NULL);
menu_driver_set_texture();