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

(RARCH_CONSOLE) Refactored out rmenu_hd/rmenu_widescreen

This commit is contained in:
twinaphex 2013-01-11 18:14:16 +01:00
parent 79dd7f79d7
commit b67fd69c26
5 changed files with 81 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
frontend/menu/rmenu_xui.cpp
View File

@ -385,7 +385,7 @@ HRESULT CRetroArchSettings::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF"); m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF");
m_settingslist.SetText(SETTING_EMU_SHOW_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) ? L"Info messages: ON" : L"Info messages: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_INFO_DRAW)) ? L"Info messages: ON" : L"Info messages: OFF");
m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF");
m_settingslist.SetText(SETTING_EMU_MENUS, g_extern.console.rmenu.state.rmenu_hd.enable ? L"Menus: HD" : L"Menus: SD"); m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD");
m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF"); m_settingslist.SetText(SETTING_GAMMA_CORRECTION_ENABLED, g_extern.console.screen.gamma_correction ? L"Gamma correction: ON" : L"Gamma correction: OFF");
m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER, g_settings.video.smooth ? L"Hardware filtering shader #1: Linear interpolation" : L"Hardware filtering shader #1: Point filtering"); m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER, g_settings.video.smooth ? L"Hardware filtering shader #1: Linear interpolation" : L"Hardware filtering shader #1: Point filtering");
m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER_2, g_settings.video.second_pass_smooth ? L"Hardware filtering shader #2: Linear interpolation" : L"Hardware filtering shader #2: Point filtering"); m_settingslist.SetText(SETTING_HW_TEXTURE_FILTER_2, g_settings.video.second_pass_smooth ? L"Hardware filtering shader #2: Linear interpolation" : L"Hardware filtering shader #2: Point filtering");
@ -437,8 +437,11 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF");
break; break;
case SETTING_EMU_MENUS: case SETTING_EMU_MENUS:
g_extern.console.rmenu.state.rmenu_hd.enable = !g_extern.console.rmenu.state.rmenu_hd.enable; if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD))
m_settingslist.SetText(SETTING_EMU_MENUS, g_extern.console.rmenu.state.rmenu_hd.enable ? L"Menus: HD" : L"Menus: SD"); g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_HD);
else
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_HD);
m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_menu_status & (1 << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD");
break; break;
case SETTING_GAMMA_CORRECTION_ENABLED: case SETTING_GAMMA_CORRECTION_ENABLED:
g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1; g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1;
@ -448,7 +451,7 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
break; break;
case SETTING_SHADER: case SETTING_SHADER:
g_extern.lifecycle_menu_state |= (1 << MODE_LOAD_FIRST_SHADER); g_extern.lifecycle_menu_state |= (1 << MODE_LOAD_FIRST_SHADER);
hr = XuiSceneCreate(g_extern.console.rmenu.state.rmenu_hd.enable ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"rarch_shader_browser.xur", NULL, &app.hShaderBrowser); hr = XuiSceneCreate((g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"rarch_shader_browser.xur", NULL, &app.hShaderBrowser);
if (hr < 0) if (hr < 0)
RARCH_ERR("Failed to load scene.\n"); RARCH_ERR("Failed to load scene.\n");
@ -462,7 +465,7 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
break; break;
case SETTING_SHADER_2: case SETTING_SHADER_2:
g_extern.lifecycle_menu_state |= (1 << MODE_LOAD_SECOND_SHADER); g_extern.lifecycle_menu_state |= (1 << MODE_LOAD_SECOND_SHADER);
hr = XuiSceneCreate(g_extern.console.rmenu.state.rmenu_hd.enable ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"rarch_shader_browser.xur", NULL, &app.hShaderBrowser); hr = XuiSceneCreate((g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) ? L"file://game:/media/hd/" : L"file://game:/media/sd/", L"rarch_shader_browser.xur", NULL, &app.hShaderBrowser);
if (hr < 0) if (hr < 0)
RARCH_ERR("Failed to load scene.\n"); RARCH_ERR("Failed to load scene.\n");
@ -539,8 +542,11 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF");
break; break;
case SETTING_EMU_MENUS: case SETTING_EMU_MENUS:
g_extern.console.rmenu.state.rmenu_hd.enable = !g_extern.console.rmenu.state.rmenu_hd.enable; if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD))
m_settingslist.SetText(SETTING_EMU_MENUS, g_extern.console.rmenu.state.rmenu_hd.enable ? L"Menus: HD" : L"Menus: SD"); g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_HD);
else
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_HD);
m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_menu_status & (1 << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD");
break; break;
case SETTING_GAMMA_CORRECTION_ENABLED: case SETTING_GAMMA_CORRECTION_ENABLED:
g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1; g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1;
@ -604,8 +610,11 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF"); m_settingslist.SetText(SETTING_EMU_SHOW_DEBUG_INFO_MSG, (g_extern.lifecycle_menu_state & (1 << MODE_FPS_DRAW)) ? L"Debug Info messages: ON" : L"Debug Info messages: OFF");
break; break;
case SETTING_EMU_MENUS: case SETTING_EMU_MENUS:
g_extern.console.rmenu.state.rmenu_hd.enable = !g_extern.console.rmenu.state.rmenu_hd.enable; if (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD))
m_settingslist.SetText(SETTING_EMU_MENUS, g_extern.console.rmenu.state.rmenu_hd.enable ? L"Menus: HD" : L"Menus: SD"); g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_HD);
else
g_extern.lifecycle_menu_state |= (1 << MODE_MENU_HD);
m_settingslist.SetText(SETTING_EMU_MENUS, (g_extern.lifecycle_menu_status & (1 << MODE_MENU_HD)) ? L"Menus: HD" : L"Menus: SD");
break; break;
case SETTING_GAMMA_CORRECTION_ENABLED: case SETTING_GAMMA_CORRECTION_ENABLED:
g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1; g_extern.console.screen.gamma_correction = g_extern.console.screen.gamma_correction ? 0 : 1;
@ -1014,7 +1023,7 @@ HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
{ {
xdk_d3d_video_t *vid = (xdk_d3d_video_t*)driver.video_data; xdk_d3d_video_t *vid = (xdk_d3d_video_t*)driver.video_data;
bool hdmenus_allowed = g_extern.console.rmenu.state.rmenu_hd.enable; bool hdmenus_allowed = (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD));
HRESULT hr; HRESULT hr;
@ -1093,7 +1102,7 @@ void menu_init (void)
xdk_d3d_video_t *device_ptr = (xdk_d3d_video_t*)driver.video_data; xdk_d3d_video_t *device_ptr = (xdk_d3d_video_t*)driver.video_data;
bool hdmenus_allowed = g_extern.console.rmenu.state.rmenu_hd.enable; bool hdmenus_allowed = (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD));
if (hdmenus_allowed) if (hdmenus_allowed)
RARCH_LOG("HD menus enabled.\n"); RARCH_LOG("HD menus enabled.\n");

8
general.h
View File

@ -106,6 +106,8 @@ enum menu_enums
MODE_LOAD_GAME, MODE_LOAD_GAME,
MODE_INIT, MODE_INIT,
MODE_MENU, MODE_MENU,
MODE_MENU_WIDESCREEN,
MODE_MENU_HD,
MODE_MENU_PREINIT, MODE_MENU_PREINIT,
MODE_MENU_INGAME, MODE_MENU_INGAME,
MODE_MENU_DRAW, MODE_MENU_DRAW,
@ -501,12 +503,6 @@ struct global
{ {
unsigned input_loop; unsigned input_loop;
float font_size; float font_size;
struct
{
rarch_boolean_state_t rmenu_widescreen;
rarch_boolean_state_t rmenu_hd;
} state;
} rmenu; } rmenu;
struct struct

28
gfx/context/xdk_ctx.c
View File

@ -299,19 +299,19 @@ static void gfx_ctx_xdk_get_video_size(unsigned *width, unsigned *height)
{ {
*width = 1280; *width = 1280;
*height = 720; *height = 720;
g_extern.console.rmenu.state.rmenu_hd.enable = true; g_extern.lifecycle_menu_state |= (1 << MODE_MENU_HD);
} }
else else
{ {
*width = 640; *width = 640;
*height = 480; *height = 480;
g_extern.console.rmenu.state.rmenu_hd.enable = false; g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_HD);
} }
if(video_mode.fIsWideScreen) if(video_mode.fIsWideScreen)
g_extern.console.rmenu.state.rmenu_widescreen.enable = true; g_extern.lifecycle_menu_state |= (1 << MODE_MENU_WIDESCREEN);
else else
g_extern.console.rmenu.state.rmenu_widescreen.enable = false; g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_WIDESCREEN);
#elif defined(_XBOX1) #elif defined(_XBOX1)
DWORD video_mode = XGetVideoFlags(); DWORD video_mode = XGetVideoFlags();
@ -334,10 +334,10 @@ static void gfx_ctx_xdk_get_video_size(unsigned *width, unsigned *height)
*width = 720; *width = 720;
*height = 576; *height = 576;
} }
g_extern.console.rmenu.state.rmenu_widescreen.enable = true; g_extern.lifecycle_menu_state |= (1 << MODE_MENU_WIDESCREEN);
} }
else else
g_extern.console.rmenu.state.rmenu_widescreen.enable = false; g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_WIDESCREEN);
} }
else else
{ {
@ -346,10 +346,10 @@ static void gfx_ctx_xdk_get_video_size(unsigned *width, unsigned *height)
{ {
*width = 720; *width = 720;
*height = 480; *height = 480;
g_extern.console.rmenu.state.rmenu_widescreen.enable = true; g_extern.lifecycle_menu_state |= (1 << MODE_MENU_WIDESCREEN);
} }
else else
g_extern.console.rmenu.state.rmenu_widescreen.enable = false; g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_WIDESCREEN);
} }
if(XGetAVPack() == XC_AV_PACK_HDTV) if(XGetAVPack() == XC_AV_PACK_HDTV)
@ -358,22 +358,22 @@ static void gfx_ctx_xdk_get_video_size(unsigned *width, unsigned *height)
{ {
*width = 640; *width = 640;
*height = 480; *height = 480;
g_extern.console.rmenu.state.rmenu_widescreen.enable = false; g_extern.lifecycle_menu_state &= ~(1 << MODE_MENU_WIDESCREEN);
g_extern.console.rmenu.state.rmenu_hd.enable = true; g_extern.lifecycle_menu_state |= (1 << MODE_MENU_HD);
} }
else if(video_mode & XC_VIDEO_FLAGS_HDTV_720p) else if(video_mode & XC_VIDEO_FLAGS_HDTV_720p)
{ {
*width = 1280; *width = 1280;
*height = 720; *height = 720;
g_extern.console.rmenu.state.rmenu_widescreen.enable = true; g_extern.lifecycle_menu_state |= (1 << MODE_MENU_WIDESCREEN);
g_extern.console.rmenu.state.rmenu_hd.enable = true; g_extern.lifecycle_menu_state |= (1 << MODE_MENU_HD);
} }
else if(video_mode & XC_VIDEO_FLAGS_HDTV_1080i) else if(video_mode & XC_VIDEO_FLAGS_HDTV_1080i)
{ {
*width = 1920; *width = 1920;
*height = 1080; *height = 1080;
g_extern.console.rmenu.state.rmenu_widescreen.enable = true; g_extern.lifecycle_menu_state |= (1 << MODE_MENU_WIDESCREEN);
g_extern.console.rmenu.state.rmenu_hd.enable = true; g_extern.lifecycle_menu_state |= (1 << MODE_MENU_HD);
} }
} }
#else #else

4
gfx/fonts/xdk360_fonts.cpp
View File

@ -19,7 +19,7 @@
#include "../../general.h" #include "../../general.h"
#include "../../xdk/xdk_resources.h" #include "../../xdk/xdk_resources.h"
#define FONT_SCALE (g_extern.console.rmenu.state.rmenu_hd.enable ? 2 : 1) #define FONT_SCALE ((g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) ? 2 : 1)
typedef struct GLYPH_ATTR typedef struct GLYPH_ATTR
{ {
@ -447,7 +447,7 @@ static void xdk_render_msg(void *driver, const char *msg)
{ {
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver; xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver;
float x = g_extern.console.rmenu.state.rmenu_hd.enable ? 160 : 100; float x = (g_extern.lifecycle_menu_state & (1 << MODE_MENU_HD)) ? 160 : 100;
float y = 120; float y = 120;
xdk_render_msg_place(d3d, x, y, 0, 0, msg); xdk_render_msg_place(d3d, x, y, 0, 0, msg);

7
xdk/xdk_d3d.cpp
View File

@ -374,6 +374,7 @@ static bool xdk_d3d_set_shader(void *data, enum rarch_shader_type type, const ch
void xdk_d3d_generate_pp(D3DPRESENT_PARAMETERS *d3dpp, const video_info_t *video) void xdk_d3d_generate_pp(D3DPRESENT_PARAMETERS *d3dpp, const video_info_t *video)
{ {
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data; xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data;
unsigned lifecycle_menu_state = g_extern.lifecycle_menu_state;
memset(d3dpp, 0, sizeof(*d3dpp)); memset(d3dpp, 0, sizeof(*d3dpp));
@ -415,14 +416,14 @@ void xdk_d3d_generate_pp(D3DPRESENT_PARAMETERS *d3dpp, const video_info_t *video
d3dpp->Flags = D3DPRESENTFLAG_INTERLACED; d3dpp->Flags = D3DPRESENTFLAG_INTERLACED;
} }
if(g_extern.console.rmenu.state.rmenu_widescreen.enable) if (lifecycle_menu_state & MODE_MENU_WIDESCREEN)
d3dpp->Flags |= D3DPRESENTFLAG_WIDESCREEN; d3dpp->Flags |= D3DPRESENTFLAG_WIDESCREEN;
d3dpp->BackBufferFormat = D3DFMT_X8R8G8B8; d3dpp->BackBufferFormat = D3DFMT_X8R8G8B8;
d3dpp->FullScreen_PresentationInterval = d3d->vsync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE; d3dpp->FullScreen_PresentationInterval = d3d->vsync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE;
d3dpp->SwapEffect = D3DSWAPEFFECT_COPY; d3dpp->SwapEffect = D3DSWAPEFFECT_COPY;
#elif defined(_XBOX360) #elif defined(_XBOX360)
if(!g_extern.console.rmenu.state.rmenu_widescreen.enable) if (!lifecycle_menu_state & MODE_MENU_WIDESCREEN)
d3dpp->Flags |= D3DPRESENTFLAG_NO_LETTERBOX; d3dpp->Flags |= D3DPRESENTFLAG_NO_LETTERBOX;
if (g_extern.console.screen.gamma_correction) if (g_extern.console.screen.gamma_correction)
@ -866,7 +867,7 @@ static bool xdk_d3d_frame(void *data, const void *frame,
float msg_width = 60; float msg_width = 60;
float msg_height = 365; float msg_height = 365;
#elif defined(_XBOX360) #elif defined(_XBOX360)
float mem_width = g_extern.console.rmenu.state.rmenu_hd.enable ? 160 : 100; float mem_width = (lifecycle_menu_state & (1 << MODE_MENU_HD)) ? 160 : 100;
float mem_height = 70; float mem_height = 70;
float msg_width = mem_width; float msg_width = mem_width;
float msg_height = mem_height + 50; float msg_height = mem_height + 50;