(360) Add 'force 16bit color' option

This commit is contained in:
twinaphex 2012-11-20 03:09:11 +01:00
parent a8b3d23184
commit e9dc0faace
4 changed files with 10 additions and 18 deletions

View File

@ -386,7 +386,7 @@ HRESULT CRetroArchSettings::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
m_settingslist.SetText(SETTING_SCALE_ENABLED, g_settings.video.render_to_texture ? L"Custom Scaling/Dual Shaders: ON" : L"Custom Scaling/Dual Shaders: OFF");
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_SHADER, sizeof(strw_buffer));
m_settingslist.SetText(SETTING_SHADER, strw_buffer);
m_settingslist.SetText(SETTING_COLOR_FORMAT, g_settings.video.color_format ? L"Color format: 32bit ARGB" : L"Color format: 16bit RGBA");
m_settingslist.SetText(SETTING_COLOR_FORMAT, g_settings.video.force_16bit ? L"Force 16bit color: ON" : L"Force 16bit color: OFF");
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_SHADER_2, sizeof(strw_buffer));
m_settingslist.SetText(SETTING_SHADER_2, strw_buffer);
rarch_settings_create_menu_item_label_w(strw_buffer, S_LBL_SCALE_FACTOR, sizeof(strw_buffer));
@ -431,8 +431,8 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break;
case SETTING_COLOR_FORMAT:
g_settings.video.color_format = !g_settings.video.color_format;
m_settingslist.SetText(SETTING_COLOR_FORMAT, g_settings.video.color_format ? L"Color format: 32bit ARGB" : L"Color format: 16bit RGBA");
g_settings.video.force_16bit = !g_settings.video.force_16bit;
m_settingslist.SetText(SETTING_COLOR_FORMAT, g_settings.video.force_16bit ? L"Force 16bit color: ON" : L"Force 16bit color: OFF");
if (g_extern.console.rmenu.state.msg_info.enable)
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break;
@ -525,8 +525,8 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break;
case SETTING_COLOR_FORMAT:
g_settings.video.color_format = !g_settings.video.color_format;
m_settingslist.SetText(SETTING_COLOR_FORMAT, g_settings.video.color_format ? L"Color format: 32bit ARGB" : L"Color format: 16bit RGBA");
g_settings.video.force_16bit = !g_settings.video.force_16bit;
m_settingslist.SetText(SETTING_COLOR_FORMAT, g_settings.video.force_16bit ? L"Force 16bit color: ON" : L"Force 16bit color: OFF");
if (g_extern.console.rmenu.state.msg_info.enable)
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break;
@ -583,8 +583,8 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break;
case SETTING_COLOR_FORMAT:
g_settings.video.color_format = !g_settings.video.color_format;
m_settingslist.SetText(SETTING_COLOR_FORMAT, g_settings.video.color_format ? L"Color format: 32bit ARGB" : L"Color format: 16bit RGBA");
g_settings.video.force_16bit = !g_settings.video.force_16bit;
m_settingslist.SetText(SETTING_COLOR_FORMAT, g_settings.video.force_16bit ? L"Force 16bit color: ON" : L"Force 16bit color: OFF");
if (g_extern.console.rmenu.state.msg_info.enable)
rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180);
break;

View File

@ -93,9 +93,7 @@ void rarch_config_load(const char *conf_name, bool upgrade_core_succeeded)
#ifdef HAVE_ZLIB
CONFIG_GET_INT_EXTERN(file_state.zip_extract_mode, "zip_extract_mode");
#endif
#ifdef _XBOX360
CONFIG_GET_INT(video.color_format, "color_format");
#endif
CONFIG_GET_BOOL(video.force_16bit, "video_force_16bit");
CONFIG_GET_INT_EXTERN(console.screen.resolutions.current.id, "current_resolution_id");
CONFIG_GET_INT_EXTERN(state_slot, "state_slot");
CONFIG_GET_INT_EXTERN(audio_data.mute, "audio_mute");
@ -144,7 +142,7 @@ void rarch_config_save(const char * conf_name)
config_set_bool(conf, "video_smooth", g_settings.video.smooth);
config_set_bool(conf, "video_vsync", g_settings.video.vsync);
config_set_int(conf, "aspect_ratio_index", g_settings.video.aspect_ratio_idx);
config_set_int(conf, "color_format", g_settings.video.color_format);
config_set_bool(conf, "video_force_16bit", g_settings.video.force_16bit);
config_set_string(conf, "audio_device", g_settings.audio.device);
config_set_bool(conf, "audio_rate_control", g_settings.audio.rate_control);
config_set_float(conf, "audio_rate_control_delta", g_settings.audio.rate_control_delta);

View File

@ -374,9 +374,7 @@ void rarch_settings_set_default(void)
g_settings.video.msg_pos_x = 0.05f;
g_settings.video.msg_pos_y = 0.90f;
g_settings.video.aspect_ratio = -1.0f;
#ifdef _XBOX360
g_settings.video.color_format = 0;
#endif
g_settings.video.force_16bit = false;
// g_extern
strlcpy(g_extern.console.main_wrap.paths.default_sram_dir, default_paths.sram_dir, sizeof(g_extern.console.main_wrap.paths.default_sram_dir));

View File

@ -103,10 +103,6 @@ struct settings
enum rarch_shader_type shader_type;
float refresh_rate;
#ifdef RARCH_CONSOLE
unsigned color_format;
#endif
bool render_to_texture;
struct