From 9272fdcdd6e1affe0c57339b0411d0ed9e325788 Mon Sep 17 00:00:00 2001 From: TwinAphex51224 Date: Tue, 8 May 2012 03:36:38 +0200 Subject: [PATCH] (360) Add FBO on/off switch --- 360/media/hd/rarch_settings.xui | 13 +++++++++++++ 360/media/sd/rarch_settings.xui | 13 +++++++++++++ 360/menu.cpp | 6 ++++++ 360/menu.h | 3 ++- 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/360/media/hd/rarch_settings.xui b/360/media/hd/rarch_settings.xui index 9ae30fa48c..a3439a68e3 100644 --- a/360/media/hd/rarch_settings.xui +++ b/360/media/hd/rarch_settings.xui @@ -51,6 +51,7 @@ Rewind: Gamma Correction: Hardware filtering: +Custom Scaling/Dual Shaders @@ -125,6 +126,18 @@ Hardware filtering: 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 1d9725e149..e62d06c8a1 100644 --- a/360/media/sd/rarch_settings.xui +++ b/360/media/sd/rarch_settings.xui @@ -51,6 +51,7 @@ Rewind: Gamma Correction: Hardware filtering: +Cutom Scaling/Dual Shaders: @@ -101,6 +102,18 @@ Hardware filtering: 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/menu.cpp b/360/menu.cpp index 474cc6725c..4dbf21f63f 100644 --- a/360/menu.cpp +++ b/360/menu.cpp @@ -137,6 +137,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_GAMMA_CORRECTION_ENABLED, g_console.gamma_correction_enable ? L"Gamma correction: ON" : L"Gamma correction: OFF"); m_settingslist.SetText(SETTING_HARDWARE_FILTERING, set_filter_element(g_settings.video.smooth)); + m_settingslist.SetText(SETTING_SCALE_ENABLED, g_console.fbo_enabled ? L"Custom Scaling/Dual Shaders: ON" : L"Custom Scaling/Dual Shaders: OFF"); return S_OK; } @@ -418,6 +419,11 @@ HRESULT CRetroArchSettings::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled g_settings.video.smooth = !g_settings.video.smooth; m_settingslist.SetText(SETTING_HARDWARE_FILTERING, set_filter_element(g_settings.video.smooth)); break; + case SETTING_SCALE_ENABLED: + g_console.fbo_enabled = !g_console.fbo_enabled; + m_settingslist.SetText(SETTING_SCALE_ENABLED, g_console.fbo_enabled ? L"Custom Scaling/Dual Shaders: ON" : L"Custom Scaling/Dual Shaders: OFF"); + xdk360_set_fbo_enable(g_console.fbo_enabled); + break; } } diff --git a/360/menu.h b/360/menu.h index acae329658..00942ab988 100644 --- a/360/menu.h +++ b/360/menu.h @@ -24,7 +24,8 @@ enum { SETTING_EMU_REWIND_ENABLED = 0, SETTING_GAMMA_CORRECTION_ENABLED, - SETTING_HARDWARE_FILTERING + SETTING_HARDWARE_FILTERING, + SETTING_SCALE_ENABLED }; class CRetroArch : public CXuiModule