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

gsdx-gui: Remove custom resolution from the windows gui. 

Leave it as an ini option only.
People should never use custom resolution as it causes many issues and
many features aren't supported with it.
On linux option was removed a long time ago.
This commit is contained in:
lightningterror 2020-03-22 18:47:37 +01:00
parent 15a9a95284
commit 8f3b908e38
4 changed files with 37 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/GSdx/GSdx.cpp
View File

@ -247,9 +247,6 @@ void GSdxApp::Init()
m_gs_upscale_multiplier.push_back(GSSetting(5, "5x Native", "~1620p 3K")); m_gs_upscale_multiplier.push_back(GSSetting(5, "5x Native", "~1620p 3K"));
m_gs_upscale_multiplier.push_back(GSSetting(6, "6x Native", "~2160p 4K")); m_gs_upscale_multiplier.push_back(GSSetting(6, "6x Native", "~2160p 4K"));
m_gs_upscale_multiplier.push_back(GSSetting(8, "8x Native", "~2880p 5K")); m_gs_upscale_multiplier.push_back(GSSetting(8, "8x Native", "~2880p 5K"));
#ifndef __unix__
m_gs_upscale_multiplier.push_back(GSSetting(0, "Custom", "Not Recommended"));
#endif
m_gs_max_anisotropy.push_back(GSSetting(0, "Off", "Default")); m_gs_max_anisotropy.push_back(GSSetting(0, "Off", "Default"));
m_gs_max_anisotropy.push_back(GSSetting(2, "2x", "")); m_gs_max_anisotropy.push_back(GSSetting(2, "2x", ""));

55
plugins/GSdx/GSdx.rc
View File

@ -280,7 +280,7 @@ BEGIN
PUSHBUTTON "Cancel",IDCANCEL,124,168,50,14 PUSHBUTTON "Cancel",IDCANCEL,124,168,50,14
END END
IDD_CONFIG DIALOGEX 0, 0, 242, 387 IDD_CONFIG DIALOGEX 0, 0, 242, 371
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "GSdx Settings" CAPTION "GSdx Settings"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@ -299,42 +299,37 @@ BEGIN
COMBOBOX IDC_FILTER,70,100,166,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_FILTER,70,100,166,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "OpenCL Device:",IDC_OPENCL_TEXT,6,117,53,8 LTEXT "OpenCL Device:",IDC_OPENCL_TEXT,6,117,53,8
COMBOBOX IDC_OPENCL_DEVICE,70,115,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_OPENCL_DEVICE,70,115,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "OSD Configuration",IDC_OSDBUTTON,10,341,108,14 PUSHBUTTON "OSD Configuration",IDC_OSDBUTTON,10,325,108,14
PUSHBUTTON "Shader Configuration",IDC_SHADEBUTTON,124,341,108,14 PUSHBUTTON "Shader Configuration",IDC_SHADEBUTTON,124,325,108,14
DEFPUSHBUTTON "OK",IDOK,68,367,50,14 DEFPUSHBUTTON "OK",IDOK,68,351,50,14
PUSHBUTTON "Cancel",IDCANCEL,124,367,50,14 PUSHBUTTON "Cancel",IDCANCEL,124,351,50,14
// Hardware Renderer Settings: // Hardware Renderer Settings:
GROUPBOX "Hardware Renderer Settings",IDC_STATIC,6,132,230,155,BS_CENTER GROUPBOX "Hardware Renderer Settings",IDC_STATIC,6,132,230,139,BS_CENTER
CONTROL "Allow 8-Bit Textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,144,90,10 CONTROL "Allow 8-Bit Textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,144,90,10
CONTROL "Large Framebuffer",IDC_LARGE_FB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,104,144,90,10 CONTROL "Large Framebuffer",IDC_LARGE_FB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,104,144,90,10
LTEXT "Internal Resolution:",IDC_UPSCALE_MULTIPLIER_TEXT,22,160,79,8 LTEXT "Internal Resolution:",IDC_UPSCALE_MULTIPLIER_TEXT,22,160,79,8
COMBOBOX IDC_UPSCALE_MULTIPLIER,104,158,127,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_UPSCALE_MULTIPLIER,104,158,127,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Custom Resolution:",IDC_CUSTOM_TEXT,22,176,79,8 LTEXT "Anisotropic Filtering:",IDC_AFCOMBO_TEXT,22,176,79,8
EDITTEXT IDC_RESX_EDIT,104,174,61,13,ES_AUTOHSCROLL | ES_NUMBER COMBOBOX IDC_AFCOMBO,104,174,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "",IDC_RESX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,0,0,11,14 LTEXT "Mipmapping (Ins):",IDC_MIPMAP_HW_TEXT,22,192,79,8
EDITTEXT IDC_RESY_EDIT,170,174,61,13,ES_AUTOHSCROLL | ES_NUMBER COMBOBOX IDC_MIPMAP_HW,104,190,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "",IDC_RESY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,0,0,11,14 LTEXT "CRC Hack Level:",IDC_CRC_LEVEL_TEXT,22,208,79,8
LTEXT "Anisotropic Filtering:",IDC_AFCOMBO_TEXT,22,192,79,8 COMBOBOX IDC_CRC_LEVEL,104,206,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_AFCOMBO,104,190,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "DATE Accuracy:",IDC_ACCURATE_DATE_TEXT,22,224,79,8
LTEXT "Mipmapping (Ins):",IDC_MIPMAP_HW_TEXT,22,208,79,8 COMBOBOX IDC_ACCURATE_DATE,104,222,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_MIPMAP_HW,104,206,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "Blending Accuracy:",IDC_ACCURATE_BLEND_UNIT_TEXT,22,240,79,8
LTEXT "CRC Hack Level:",IDC_CRC_LEVEL_TEXT,22,224,79,8 COMBOBOX IDC_ACCURATE_BLEND_UNIT,104,238,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_CRC_LEVEL,104,222,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_ACCURATE_BLEND_UNIT_D3D11,104,238,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "DATE Accuracy:",IDC_ACCURATE_DATE_TEXT,22,240,79,8 CONTROL "Enable HW Hacks",IDC_HACKS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,256,71,10
COMBOBOX IDC_ACCURATE_DATE,104,238,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Advanced Settings and Hacks",IDC_HACKSBUTTON,104,253,127,14
LTEXT "Blending Accuracy:",IDC_ACCURATE_BLEND_UNIT_TEXT,22,256,79,8
COMBOBOX IDC_ACCURATE_BLEND_UNIT,104,254,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_ACCURATE_BLEND_UNIT_D3D11,104,254,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Enable HW Hacks",IDC_HACKS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,272,71,10
PUSHBUTTON "Advanced Settings and Hacks",IDC_HACKSBUTTON,104,269,127,14
// Software Renderer Settings: // Software Renderer Settings:
GROUPBOX "Software Renderer Settings",IDC_STATIC,6,295,230,41,BS_CENTER GROUPBOX "Software Renderer Settings",IDC_STATIC,6,279,230,41,BS_CENTER
CONTROL "Auto Flush",IDC_AUTO_FLUSH_SW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,306,91,10 CONTROL "Auto Flush",IDC_AUTO_FLUSH_SW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,290,91,10
CONTROL "Edge Anti-aliasing (Del)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,124,306,91,10 CONTROL "Edge Anti-aliasing (Del)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,124,290,91,10
LTEXT "Rendering threads:",IDC_SWTHREADS_TEXT,124,321,65,8 LTEXT "Rendering threads:",IDC_SWTHREADS_TEXT,124,305,65,8
EDITTEXT IDC_SWTHREADS_EDIT,197,319,34,13,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_SWTHREADS_EDIT,197,303,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 "",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,322,90,10 CONTROL "Mipmapping",IDC_MIPMAP_SW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,306,90,10
END END

13
plugins/GSdx/Window/GSSettingsDlg.cpp
View File

@ -139,12 +139,6 @@ void GSSettingsDlg::OnInit()
// Hacks // Hacks
CheckDlgButton(m_hWnd, IDC_HACKS_ENABLED, theApp.GetConfigB("UserHacks")); CheckDlgButton(m_hWnd, IDC_HACKS_ENABLED, theApp.GetConfigB("UserHacks"));
SendMessage(GetDlgItem(m_hWnd, IDC_RESX), UDM_SETRANGE, 0, MAKELPARAM(8192, 256));
SendMessage(GetDlgItem(m_hWnd, IDC_RESX), UDM_SETPOS, 0, MAKELPARAM(theApp.GetConfigI("resx"), 0));
SendMessage(GetDlgItem(m_hWnd, IDC_RESY), UDM_SETRANGE, 0, MAKELPARAM(8192, 256));
SendMessage(GetDlgItem(m_hWnd, IDC_RESY), UDM_SETPOS, 0, MAKELPARAM(theApp.GetConfigI("resy"), 0));
SendMessage(GetDlgItem(m_hWnd, IDC_SWTHREADS), UDM_SETRANGE, 0, MAKELPARAM(16, 0)); SendMessage(GetDlgItem(m_hWnd, IDC_SWTHREADS), UDM_SETRANGE, 0, MAKELPARAM(16, 0));
SendMessage(GetDlgItem(m_hWnd, IDC_SWTHREADS), UDM_SETPOS, 0, MAKELPARAM(theApp.GetConfigI("extrathreads"), 0)); SendMessage(GetDlgItem(m_hWnd, IDC_SWTHREADS), UDM_SETPOS, 0, MAKELPARAM(theApp.GetConfigI("extrathreads"), 0));
@ -292,8 +286,6 @@ bool GSSettingsDlg::OnCommand(HWND hWnd, UINT id, UINT code)
// The LOWORD returned by UDM_GETPOS automatically restricts the value to its input range. // 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))); theApp.SetConfig("extrathreads", LOWORD(SendMessage(GetDlgItem(m_hWnd, IDC_SWTHREADS), UDM_GETPOS, 0, 0)));
theApp.SetConfig("resx", LOWORD(SendMessage(GetDlgItem(m_hWnd, IDC_RESX), UDM_GETPOS, 0, 0)));
theApp.SetConfig("resy", LOWORD(SendMessage(GetDlgItem(m_hWnd, IDC_RESY), UDM_GETPOS, 0, 0)));
} }
break; break;
} }
@ -378,11 +370,6 @@ void GSSettingsDlg::UpdateControls()
EnableWindow(GetDlgItem(m_hWnd, IDC_CRC_LEVEL), hw); EnableWindow(GetDlgItem(m_hWnd, IDC_CRC_LEVEL), hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_LARGE_FB), integer_scaling > 1 && hw); EnableWindow(GetDlgItem(m_hWnd, IDC_LARGE_FB), integer_scaling > 1 && hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_CRC_LEVEL_TEXT), hw); EnableWindow(GetDlgItem(m_hWnd, IDC_CRC_LEVEL_TEXT), hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_RESX), hw && !integer_scaling);
EnableWindow(GetDlgItem(m_hWnd, IDC_RESX_EDIT), hw && !integer_scaling);
EnableWindow(GetDlgItem(m_hWnd, IDC_RESY), hw && !integer_scaling);
EnableWindow(GetDlgItem(m_hWnd, IDC_RESY_EDIT), hw && !integer_scaling);
EnableWindow(GetDlgItem(m_hWnd, IDC_CUSTOM_TEXT), hw && !integer_scaling);
EnableWindow(GetDlgItem(m_hWnd, IDC_UPSCALE_MULTIPLIER), hw); EnableWindow(GetDlgItem(m_hWnd, IDC_UPSCALE_MULTIPLIER), hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_UPSCALE_MULTIPLIER_TEXT), hw); EnableWindow(GetDlgItem(m_hWnd, IDC_UPSCALE_MULTIPLIER_TEXT), hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_PALTEX), hw); EnableWindow(GetDlgItem(m_hWnd, IDC_PALTEX), hw);

29
plugins/GSdx/resource.h
View File

@ -27,23 +27,18 @@
#define IDC_LARGE_FB 2031 #define IDC_LARGE_FB 2031
#define IDC_UPSCALE_MULTIPLIER 2032 #define IDC_UPSCALE_MULTIPLIER 2032
#define IDC_UPSCALE_MULTIPLIER_TEXT 2033 #define IDC_UPSCALE_MULTIPLIER_TEXT 2033
#define IDC_CUSTOM_TEXT 2034 #define IDC_AFCOMBO_TEXT 2034
#define IDC_RESX 2035 #define IDC_AFCOMBO 2035
#define IDC_RESX_EDIT 2036 #define IDC_MIPMAP_HW 2036
#define IDC_RESY 2037 #define IDC_MIPMAP_HW_TEXT 2037
#define IDC_RESY_EDIT 2038 #define IDC_CRC_LEVEL 2038
#define IDC_AFCOMBO_TEXT 2039 #define IDC_CRC_LEVEL_TEXT 2039
#define IDC_AFCOMBO 2040 #define IDC_HACKS_ENABLED 2040
#define IDC_MIPMAP_HW 2041 #define IDC_ACCURATE_DATE 2041
#define IDC_MIPMAP_HW_TEXT 2042 #define IDC_ACCURATE_DATE_TEXT 2042
#define IDC_CRC_LEVEL 2043 #define IDC_ACCURATE_BLEND_UNIT 2043
#define IDC_CRC_LEVEL_TEXT 2044 #define IDC_ACCURATE_BLEND_UNIT_D3D11 2044
#define IDC_HACKS_ENABLED 2045 #define IDC_ACCURATE_BLEND_UNIT_TEXT 2045
#define IDC_ACCURATE_DATE 2046
#define IDC_ACCURATE_DATE_TEXT 2047
#define IDC_ACCURATE_BLEND_UNIT 2048
#define IDC_ACCURATE_BLEND_UNIT_D3D11 2049
#define IDC_ACCURATE_BLEND_UNIT_TEXT 2050
// Software Renderer Settings: // Software Renderer Settings:
#define IDC_MIPMAP_SW 2060 #define IDC_MIPMAP_SW 2060
#define IDC_AA1 2061 #define IDC_AA1 2061