mirror of https://github.com/PCSX2/pcsx2.git
gsdx-gui-win: Change date accuracy button list to a checkbox.
This commit is contained in:
lightningterror
parent
67a7c326fc
commit
6c6071b939
|
|
@ -285,10 +285,6 @@ void GSdxApp::Init()
|
|||
GSSetting(CRCHackLevel::Aggressive, "Aggressive", ""),
|
||||
};
|
||||
|
||||
m_gs_acc_date_level.push_back(GSSetting(0, "Off", ""));
|
||||
m_gs_acc_date_level.push_back(GSSetting(1, "Basic", ""));
|
||||
m_gs_acc_date_level.push_back(GSSetting(2, "Full", "Default"));
|
||||
|
||||
m_gs_acc_blend_level.push_back(GSSetting(0, "None", "Fastest"));
|
||||
m_gs_acc_blend_level.push_back(GSSetting(1, "Basic", "Recommended"));
|
||||
m_gs_acc_blend_level.push_back(GSSetting(2, "Medium", ""));
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ public:
|
|||
std::vector<GSSetting> m_gs_offset_hack;
|
||||
std::vector<GSSetting> m_gs_hw_mipmapping;
|
||||
std::vector<GSSetting> m_gs_crc_level;
|
||||
std::vector<GSSetting> m_gs_acc_date_level;
|
||||
std::vector<GSSetting> m_gs_acc_blend_level;
|
||||
std::vector<GSSetting> m_gs_acc_blend_level_d3d11;
|
||||
std::vector<GSSetting> m_gs_tv_shaders;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
// clang-format off
|
||||
// Microsoft Visual C++ generated resource script.
|
||||
//
|
||||
#include "resource.h"
|
||||
|
|
@ -251,7 +252,7 @@ BEGIN
|
|||
COMBOBOX IDC_COLORSPACE,102,47,48,32,CBS_DROPDOWNLIST | WS_TABSTOP
|
||||
END
|
||||
|
||||
IDD_CONFIG DIALOGEX 0, 0, 242, 373
|
||||
IDD_CONFIG DIALOGEX 0, 0, 242, 358
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "GSdx Settings"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
|
|
@ -268,14 +269,15 @@ BEGIN
|
|||
COMBOBOX IDC_INTERLACE,70,85,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Texture Filtering:",IDC_FILTER_TEXT,6,102,79,8
|
||||
COMBOBOX IDC_FILTER,70,100,166,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
PUSHBUTTON "OSD Configuration",IDC_OSDBUTTON,10,332,108,14
|
||||
PUSHBUTTON "Shader Configuration",IDC_SHADEBUTTON,124,332,108,14
|
||||
DEFPUSHBUTTON "OK",IDOK,68,352,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,124,352,50,14
|
||||
PUSHBUTTON "OSD Configuration",IDC_OSDBUTTON,10,317,108,14
|
||||
PUSHBUTTON "Shader Configuration",IDC_SHADEBUTTON,124,317,108,14
|
||||
DEFPUSHBUTTON "OK",IDOK,68,337,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,124,337,50,14
|
||||
// Hardware Renderer Settings:
|
||||
GROUPBOX "Hardware Renderer Settings",IDC_STATIC,6,121,230,155,BS_CENTER
|
||||
CONTROL "Allow 8-Bit Textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,132,90,10
|
||||
CONTROL "Large Framebuffer",IDC_LARGE_FB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,124,132,90,10
|
||||
GROUPBOX "Hardware Renderer Settings",IDC_STATIC,6,121,230,140,BS_CENTER
|
||||
CONTROL "Accurate DATE",IDC_ACCURATE_DATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,132,63,10
|
||||
CONTROL "Allow 8-Bit Textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,77,132,76,10
|
||||
CONTROL "Large Framebuffer",IDC_LARGE_FB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,158,132,75,10
|
||||
LTEXT "Internal Resolution:",IDC_UPSCALE_MULTIPLIER_TEXT,22,149,79,8
|
||||
COMBOBOX IDC_UPSCALE_MULTIPLIER,104,147,127,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Anisotropic Filtering:",IDC_AFCOMBO_TEXT,22,165,79,8
|
||||
|
|
@ -286,21 +288,19 @@ BEGIN
|
|||
COMBOBOX IDC_MIPMAP_HW,104,195,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "CRC Hack Level:",IDC_CRC_LEVEL_TEXT,22,213,79,8
|
||||
COMBOBOX IDC_CRC_LEVEL,104,211,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "DATE Accuracy:",IDC_ACCURATE_DATE_TEXT,22,229,79,8
|
||||
COMBOBOX IDC_ACCURATE_DATE,104,227,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
LTEXT "Blending Accuracy:",IDC_ACCURATE_BLEND_UNIT_TEXT,22,245,79,8
|
||||
COMBOBOX IDC_ACCURATE_BLEND_UNIT,104,243,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
COMBOBOX IDC_ACCURATE_BLEND_UNIT_D3D11,104,243,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
CONTROL "Enable HW Hacks",IDC_HACKS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,260,71,10
|
||||
PUSHBUTTON "Advanced Settings and Hacks",IDC_HACKSBUTTON,104,258,127,14
|
||||
LTEXT "Blending Accuracy:",IDC_ACCURATE_BLEND_UNIT_TEXT,22,229,79,8
|
||||
COMBOBOX IDC_ACCURATE_BLEND_UNIT,104,227,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
COMBOBOX IDC_ACCURATE_BLEND_UNIT_D3D11,104,227,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
CONTROL "Enable HW Hacks",IDC_HACKS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,245,71,10
|
||||
PUSHBUTTON "Advanced Settings and Hacks",IDC_HACKSBUTTON,104,243,127,14
|
||||
// Software Renderer Settings:
|
||||
GROUPBOX "Software Renderer Settings",IDC_STATIC,6,282,230,44,BS_CENTER
|
||||
CONTROL "Auto Flush",IDC_AUTO_FLUSH_SW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,294,90,10
|
||||
CONTROL "Edge Anti-aliasing (Del)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,124,294,90,10
|
||||
LTEXT "Rendering threads:",IDC_SWTHREADS_TEXT,124,310,65,8
|
||||
EDITTEXT IDC_SWTHREADS_EDIT,197,308,34,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||
GROUPBOX "Software Renderer Settings",IDC_STATIC,6,267,230,44,BS_CENTER
|
||||
CONTROL "Auto Flush",IDC_AUTO_FLUSH_SW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,279,90,10
|
||||
CONTROL "Edge Anti-aliasing (Del)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,124,279,90,10
|
||||
LTEXT "Rendering threads:",IDC_SWTHREADS_TEXT,124,295,65,8
|
||||
EDITTEXT IDC_SWTHREADS_EDIT,197,293,34,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,0,0,11,14
|
||||
CONTROL "Mipmapping",IDC_MIPMAP_SW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,310,90,10
|
||||
CONTROL "Mipmapping",IDC_MIPMAP_SW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,295,90,10
|
||||
END
|
||||
|
||||
|
||||
|
|
@ -425,4 +425,4 @@ END
|
|||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#endif // not APSTUDIO_INVOKED
|
||||
|
||||
// clang-format on
|
||||
|
|
|
|||
|
|
@ -98,12 +98,7 @@ const char* dialog_message(int ID, bool* updateText) {
|
|||
case IDC_ACCURATE_DATE:
|
||||
return "Implement a more accurate algorithm to compute GS destination alpha testing.\n"
|
||||
"It improves shadow and transparency rendering.\n\n"
|
||||
"None:\nDisables DATE accuracy.\n\n"
|
||||
"Basic:\nBasic DATE accuracy.\n"
|
||||
"Can be inaccurate at times.\n"
|
||||
"Full:\nFully emulates DATE accuracy. Might be slower.\n"
|
||||
"This is the recommended setting.\n\n"
|
||||
"Note: Full mode is not available on Direct3D, Basic mode will be used on Full level as well.";
|
||||
"Note: Direct3D is less accurate.";
|
||||
case IDC_ACCURATE_BLEND_UNIT:
|
||||
return "Control the accuracy level of the GS blending unit emulation.\n\n"
|
||||
"None:\nFast but introduces various rendering issues.\n"
|
||||
|
|
|
|||
|
|
@ -97,12 +97,12 @@ void GSSettingsDlg::OnInit()
|
|||
ComboBoxInit(IDC_UPSCALE_MULTIPLIER, theApp.m_gs_upscale_multiplier, theApp.GetConfigI("upscale_multiplier"));
|
||||
ComboBoxInit(IDC_AFCOMBO, theApp.m_gs_max_anisotropy, theApp.GetConfigI("MaxAnisotropy"));
|
||||
ComboBoxInit(IDC_FILTER, theApp.m_gs_bifilter, theApp.GetConfigI("filter"));
|
||||
ComboBoxInit(IDC_ACCURATE_DATE, theApp.m_gs_acc_date_level, theApp.GetConfigI("accurate_date"));
|
||||
ComboBoxInit(IDC_ACCURATE_BLEND_UNIT, theApp.m_gs_acc_blend_level, theApp.GetConfigI("accurate_blending_unit"));
|
||||
ComboBoxInit(IDC_ACCURATE_BLEND_UNIT_D3D11, theApp.m_gs_acc_blend_level_d3d11, theApp.GetConfigI("accurate_blending_unit_d3d11"));
|
||||
ComboBoxInit(IDC_CRC_LEVEL, theApp.m_gs_crc_level, theApp.GetConfigI("crc_hack_level"));
|
||||
ComboBoxInit(IDC_DITHERING, theApp.m_gs_dithering, theApp.GetConfigI("dithering_ps2"));
|
||||
|
||||
CheckDlgButton(m_hWnd, IDC_ACCURATE_DATE, theApp.GetConfigB("accurate_date"));
|
||||
CheckDlgButton(m_hWnd, IDC_PALTEX, theApp.GetConfigB("paltex"));
|
||||
CheckDlgButton(m_hWnd, IDC_LARGE_FB, theApp.GetConfigB("large_framebuffer"));
|
||||
CheckDlgButton(m_hWnd, IDC_MIPMAP_SW, theApp.GetConfigB("mipmap"));
|
||||
|
|
@ -222,11 +222,6 @@ bool GSSettingsDlg::OnCommand(HWND hWnd, UINT id, UINT code)
|
|||
theApp.SetConfig("filter", (int)data);
|
||||
}
|
||||
|
||||
if(ComboBoxGetSelData(IDC_ACCURATE_DATE, data))
|
||||
{
|
||||
theApp.SetConfig("accurate_date", (int)data);
|
||||
}
|
||||
|
||||
if(ComboBoxGetSelData(IDC_ACCURATE_BLEND_UNIT, data))
|
||||
{
|
||||
theApp.SetConfig("accurate_blending_unit", (int)data);
|
||||
|
|
@ -252,13 +247,14 @@ bool GSSettingsDlg::OnCommand(HWND hWnd, UINT id, UINT code)
|
|||
theApp.SetConfig("dithering_ps2", (int)data);
|
||||
}
|
||||
|
||||
theApp.SetConfig("mipmap", (int)IsDlgButtonChecked(m_hWnd, IDC_MIPMAP_SW));
|
||||
theApp.SetConfig("accurate_date", (int)IsDlgButtonChecked(m_hWnd, IDC_ACCURATE_DATE));
|
||||
theApp.SetConfig("paltex", (int)IsDlgButtonChecked(m_hWnd, IDC_PALTEX));
|
||||
theApp.SetConfig("large_framebuffer", (int)IsDlgButtonChecked(m_hWnd, IDC_LARGE_FB));
|
||||
theApp.SetConfig("aa1", (int)IsDlgButtonChecked(m_hWnd, IDC_AA1));
|
||||
theApp.SetConfig("autoflush_sw", (int)IsDlgButtonChecked(m_hWnd, IDC_AUTO_FLUSH_SW));
|
||||
theApp.SetConfig("UserHacks", (int)IsDlgButtonChecked(m_hWnd, IDC_HACKS_ENABLED));
|
||||
|
||||
theApp.SetConfig("aa1", (int)IsDlgButtonChecked(m_hWnd, IDC_AA1));
|
||||
theApp.SetConfig("autoflush_sw", (int)IsDlgButtonChecked(m_hWnd, IDC_AUTO_FLUSH_SW));
|
||||
theApp.SetConfig("mipmap", (int)IsDlgButtonChecked(m_hWnd, IDC_MIPMAP_SW));
|
||||
// The LOWORD returned by UDM_GETPOS automatically restricts the value to its input range.
|
||||
theApp.SetConfig("extrathreads", LOWORD(SendMessage(GetDlgItem(m_hWnd, IDC_SWTHREADS), UDM_GETPOS, 0, 0)));
|
||||
}
|
||||
|
|
@ -353,7 +349,6 @@ void GSSettingsDlg::UpdateControls()
|
|||
EnableWindow(GetDlgItem(m_hWnd, IDC_AFCOMBO_TEXT), hw && filter && (ogl || !IsDlgButtonChecked(m_hWnd, IDC_PALTEX)));
|
||||
}
|
||||
EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_DATE), hw);
|
||||
EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_DATE_TEXT), hw);
|
||||
EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_BLEND_UNIT), hw);
|
||||
EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_BLEND_UNIT_D3D11), hw);
|
||||
EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_BLEND_UNIT_TEXT), hw);
|
||||
|
|
|
|||
|
|
@ -33,12 +33,11 @@
|
|||
#define IDC_CRC_LEVEL_TEXT 2039
|
||||
#define IDC_HACKS_ENABLED 2040
|
||||
#define IDC_ACCURATE_DATE 2041
|
||||
#define IDC_ACCURATE_DATE_TEXT 2042
|
||||
#define IDC_ACCURATE_BLEND_UNIT 2043
|
||||
#define IDC_ACCURATE_BLEND_UNIT_D3D11 2044
|
||||
#define IDC_ACCURATE_BLEND_UNIT_TEXT 2045
|
||||
#define IDC_DITHERING 2046
|
||||
#define IDC_DITHERING_TEXT 2047
|
||||
#define IDC_ACCURATE_BLEND_UNIT 2042
|
||||
#define IDC_ACCURATE_BLEND_UNIT_D3D11 2043
|
||||
#define IDC_ACCURATE_BLEND_UNIT_TEXT 2044
|
||||
#define IDC_DITHERING 2045
|
||||
#define IDC_DITHERING_TEXT 2046
|
||||
// Software Renderer Settings:
|
||||
#define IDC_MIPMAP_SW 2060
|
||||
#define IDC_AA1 2061
|
||||
|
|
|
|||
Loading…
Reference in New Issue