mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(GX) Use g_extern.draw_menu

Browse Source
This commit is contained in:
twinaphex 2012-12-18 08:32:48 +01:00
parent 34951c121b
commit 5cd6017ff5
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gx/frontend/main.c
View File

@ -274,15 +274,13 @@ static bool folder_cb(const char *directory, rgui_file_enum_cb_t file_cb,
static bool rmenu_iterate(void)
{
gx_video_t *gx = (gx_video_t*)driver.video_data;
uint16_t old_input_state = 0;
bool first = true;
bool first_held = false;
bool initial_held = true;
g_extern.console.rmenu.state.rmenu.enable = true;
gx->menu_render = true;
g_extern.draw_menu = true;
do
{
@ -387,7 +385,7 @@ static bool rmenu_iterate(void)
}while(g_extern.console.rmenu.state.rmenu.enable);
gx->menu_render = false;
g_extern.draw_menu = false;
g_extern.console.rmenu.state.ingame_menu.enable = false;
@ -560,9 +558,9 @@ int main(int argc, char *argv[])
rarch_console_load_game_wrap(rom, g_extern.file_state.zip_extract_mode, S_DELAY_1);
rgui_iterate(rgui, RGUI_ACTION_MESSAGE);
gx->menu_render = true;
g_extern.draw_menu = true;
rarch_render_cached_frame();
gx->menu_render = false;
g_extern.draw_menu = false;
rarch_startup(default_paths.config_file);
}

4
gx/gx_input.c
View File

@ -267,8 +267,6 @@ static void gx_input_poll(void *data)
{
(void)data;
gx_video_t *gx = (gx_video_t*)driver.video_data;
bool quit_gc = false;
#ifdef HW_RVL
bool quit_classic = false;
@ -384,7 +382,7 @@ static void gx_input_poll(void *data)
quit_classic = true;
//TODO: Hack, analog stick twitchiness needs to be properly fixed
if(gx->menu_render)
if(g_extern.draw_menu)
{
s8 x = gx_stick_x(exp.classic.ljs);
s8 y = gx_stick_y(exp.classic.ljs);

9
gx/gx_video.c
View File

@ -600,7 +600,7 @@ static void update_textures(const uint32_t *src,
convert_texture(src, g_tex.data, width, height, pitch, gx->rgb32);
}
if(gx->menu_render)
if(g_extern.draw_menu)
{
convert_texture(gx->menu_data, menu_tex.data, RGUI_WIDTH, RGUI_HEIGHT, RGUI_WIDTH * 2, false);
}
@ -795,7 +795,6 @@ static bool gx_frame(void *data, const void *frame,
const char *msg)
{
gx_video_t *gx = (gx_video_t*)driver.video_data;
bool menu_render = gx->menu_render;
bool should_resize = gx->should_resize;
u8 clear_efb = GX_FALSE;
@ -806,7 +805,7 @@ static bool gx_frame(void *data, const void *frame,
else
gx->msg[0] = 0;
if (!frame && menu_render)
if (!frame && g_extern.draw_menu)
width = height = 4; // draw a black square in the background
if(should_resize)
@ -815,7 +814,7 @@ static bool gx_frame(void *data, const void *frame,
clear_efb = GX_TRUE;
}
while ((g_vsync || menu_render) && !g_draw_done)
while ((g_vsync || g_extern.draw_menu) && !g_draw_done)
LWP_ThreadSleep(g_video_cond);
if (width != gx_old_width || height != gx_old_height)
@ -838,7 +837,7 @@ static bool gx_frame(void *data, const void *frame,
GX_DrawDone();
}
if(menu_render)
if(g_extern.draw_menu)
{
GX_LoadTexObj(&menu_tex.obj, GX_TEXMAP0);
GX_CallDispList(display_list, display_list_size);

1
gx/gx_video.h
View File

@ -20,7 +20,6 @@
typedef struct gx_video
{
bool menu_render;
bool should_resize;
bool keep_aspect;
bool double_strike;