diff --git a/360/frontend-xdk/menu.cpp b/360/frontend-xdk/menu.cpp index 585b4deb41..34452566e1 100644 --- a/360/frontend-xdk/menu.cpp +++ b/360/frontend-xdk/menu.cpp @@ -386,7 +386,6 @@ 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.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)); @@ -430,12 +429,6 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled if (g_extern.console.rmenu.state.msg_info.enable) rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); break; - case SETTING_COLOR_FORMAT: - 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; case SETTING_SHADER: set_shader = 1; 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); @@ -528,12 +521,6 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro if (g_extern.console.rmenu.state.msg_info.enable) rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); break; - case SETTING_COLOR_FORMAT: - 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; case SETTING_SCALE_FACTOR: if(device_ptr->fbo_inited) { @@ -589,12 +576,6 @@ HRESULT CRetroArchSettings::OnControlNavigate(XUIMessageControlNavigate *pContro if (g_extern.console.rmenu.state.msg_info.enable) rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); break; - case SETTING_COLOR_FORMAT: - 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; case SETTING_EMU_REWIND_ENABLED: rarch_settings_change(S_REWIND); m_settingslist.SetText(SETTING_EMU_REWIND_ENABLED, g_settings.rewind_enable ? L"Rewind: ON" : L"Rewind: OFF"); @@ -1065,8 +1046,7 @@ void menu_init (void) video_info.smooth = g_settings.video.smooth; video_info.input_scale = 2; video_info.fullscreen = true; - if(g_settings.video.force_16bit) - video_info.rgb32 = false; + video_info.rgb32 = false; xdk_d3d_generate_pp(&d3dpp, &video_info); diff --git a/360/frontend-xdk/menu.h b/360/frontend-xdk/menu.h index b0fd9fdde9..1c84d48120 100644 --- a/360/frontend-xdk/menu.h +++ b/360/frontend-xdk/menu.h @@ -26,7 +26,6 @@ enum SETTING_EMU_SHOW_INFO_MSG, SETTING_EMU_MENUS, SETTING_GAMMA_CORRECTION_ENABLED, - SETTING_COLOR_FORMAT, SETTING_SHADER, SETTING_SHADER_2, SETTING_HW_TEXTURE_FILTER, diff --git a/360/media/hd/rarch_settings.xui b/360/media/hd/rarch_settings.xui index 42dda11b7f..4625c913e1 100644 --- a/360/media/hd/rarch_settings.xui +++ b/360/media/hd/rarch_settings.xui @@ -34,7 +34,6 @@ Info messages: Menus: Gamma Correction: -Color Format: Shader #1: Shader #2: Hardware filtering shader #1: @@ -236,6 +235,18 @@ Extract ZIP: 0.000000,10.000000,0.000000 + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +0.000000,10.000000,0.000000 + + diff --git a/360/media/sd/rarch_settings.xui b/360/media/sd/rarch_settings.xui index 3025d9cc16..272510cb1d 100644 --- a/360/media/sd/rarch_settings.xui +++ b/360/media/sd/rarch_settings.xui @@ -33,7 +33,6 @@ Rewind: Info messages: Menus: -Color Format: Gamma Correction: Shader #1: Shader #2: @@ -212,6 +211,18 @@ Extract ZIP: 0.000000,10.000000,0.000000 + + +control_ListItem +226.000000 +45.000000 +7.000000,22.000000,0.000000 +5 +false +XuiButton +0.000000,10.000000,0.000000 + + diff --git a/gfx/context/xdk_ctx.c b/gfx/context/xdk_ctx.c index c8332f90ec..010842366c 100644 --- a/gfx/context/xdk_ctx.c +++ b/gfx/context/xdk_ctx.c @@ -439,8 +439,7 @@ static bool gfx_ctx_xdk_init(void) } static bool gfx_ctx_xdk_set_video_mode( - unsigned width, unsigned height, - unsigned bits, bool fullscreen) + unsigned width, unsigned height, bool fullscreen) { /* TODO: implement */ return true; diff --git a/xdk/xdk_d3d.cpp b/xdk/xdk_d3d.cpp index 3f5253ef65..81a8ac034d 100644 --- a/xdk/xdk_d3d.cpp +++ b/xdk/xdk_d3d.cpp @@ -859,8 +859,7 @@ static void xdk_d3d_start(void) video_info.smooth = g_settings.video.smooth; video_info.input_scale = 2; video_info.fullscreen = true; - if(g_settings.video.force_16bit) - video_info.rgb32 = false; + video_info.rgb32 = false; driver.video_data = xdk_d3d_init(&video_info, NULL, NULL);