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

gsdx-gui: Adjust psx compat gui. 

Fix up options to properly disable on Null render.
Clean up some resource defines.
This commit is contained in:
lightningterror 2019-02-20 13:38:49 +01:00
parent c6f57c0bdb
commit 9c60541f3c
3 changed files with 65 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/GSdx/GSdx.rc
View File

@ -263,16 +263,16 @@ BEGIN
COMBOBOX IDC_RENDERER,108,57,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Resolution:",IDC_RESOLUTION_TEXT,7,74,37,8
COMBOBOX IDC_RESOLUTION,108,72,127,125,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Texture Filter (Del):",IDC_STATIC,7,90,64,8
LTEXT "Texture Filter (Del):",IDC_FILTER_TEXT,7,90,64,8
COMBOBOX IDC_FILTER,108,87,127,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Dithering (End):",IDC_STATIC,7,105,52,8
LTEXT "Dithering (End):",IDC_DITHERING_TEXT,7,105,52,8
COMBOBOX IDC_DITHERING,108,102,127,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Aspect Ratio (PgDn):",IDC_STATIC,7,120,68,8
LTEXT "Aspect Ratio (PgDn):",IDC_ASPECTRATIO_TEXT,7,120,68,8
COMBOBOX IDC_ASPECTRATIO,108,117,127,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Internal Resolution:",IDC_STATIC,7,135,64,8
LTEXT "Internal Resolution:",IDC_SCALE_TEXT,7,135,64,8
COMBOBOX IDC_SCALE,108,132,127,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Windowed",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,149,49,10
LTEXT "Extra Rend. Threads:",IDC_STATIC,108,150,70,8
LTEXT "Extra Rend. Threads:",IDC_SWTHREADS_TEXT,108,150,70,8
EDITTEXT IDC_SWTHREADS_EDIT,200,147,35,13,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,0,0,11,14
DEFPUSHBUTTON "OK",IDOK,68,168,50,14

15
plugins/GSdx/PSX/GPUSettingsDlg.cpp
View File

@ -105,7 +105,6 @@ void GPUSettingsDlg::UpdateControls()
bool dx11 = renderer == GPURendererType::D3D11_SW;
bool null = renderer == GPURendererType::NULL_Renderer;
bool sw = !null;
bool resscalenotsupported = true;
EnableWindow(GetDlgItem(m_hWnd, IDC_RESOLUTION), !resscalenotsupported);
@ -114,8 +113,16 @@ void GPUSettingsDlg::UpdateControls()
ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO11), dx11 ? SW_SHOW : SW_HIDE);
ShowWindow(GetDlgItem(m_hWnd, IDC_NULL), null ? SW_SHOW : SW_HIDE);
EnableWindow(GetDlgItem(m_hWnd, IDC_SCALE), sw);
EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS_EDIT), sw);
EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS), sw);
EnableWindow(GetDlgItem(m_hWnd, IDC_FILTER), dx11);
EnableWindow(GetDlgItem(m_hWnd, IDC_FILTER_TEXT), dx11);
EnableWindow(GetDlgItem(m_hWnd, IDC_DITHERING), dx11);
EnableWindow(GetDlgItem(m_hWnd, IDC_DITHERING_TEXT), dx11);
EnableWindow(GetDlgItem(m_hWnd, IDC_ASPECTRATIO), dx11);
EnableWindow(GetDlgItem(m_hWnd, IDC_ASPECTRATIO_TEXT), dx11);
EnableWindow(GetDlgItem(m_hWnd, IDC_SCALE), dx11);
EnableWindow(GetDlgItem(m_hWnd, IDC_SCALE_TEXT), dx11);
EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS), dx11);
EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS_TEXT), dx11);
EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS_EDIT), dx11);
}
}

95
plugins/GSdx/resource.h
View File

@ -5,23 +5,23 @@
// General Dialog:
#define IDD_CONFIG 2001
#define IDB_NULL 2002
#define IDB_LOGO11 2004
#define IDB_LOGOGL 2005
#define IDC_NULL 2006
#define IDC_LOGO11 2008
#define IDC_LOGOGL 2009
#define IDC_ADAPTER_TEXT 2010
#define IDC_ADAPTER 2011
#define IDC_RENDERER 2012
#define IDC_FILTER_TEXT 2013
#define IDC_FILTER 2014
#define IDC_INTERLACE_TEXT 2015
#define IDC_INTERLACE 2016
#define IDC_OPENCL_DEVICE 2017
#define IDC_OPENCL_TEXT 2018
#define IDC_HACKSBUTTON 2019
#define IDC_OSDBUTTON 2020
#define IDC_SHADEBUTTON 2021
#define IDB_LOGO11 2003
#define IDB_LOGOGL 2004
#define IDC_NULL 2005
#define IDC_LOGO11 2006
#define IDC_LOGOGL 2007
#define IDC_ADAPTER_TEXT 2008
#define IDC_ADAPTER 2009
#define IDC_RENDERER 2010
#define IDC_FILTER_TEXT 2011
#define IDC_FILTER 2012
#define IDC_INTERLACE_TEXT 2013
#define IDC_INTERLACE 2014
#define IDC_OPENCL_DEVICE 2015
#define IDC_OPENCL_TEXT 2016
#define IDC_HACKSBUTTON 2017
#define IDC_OSDBUTTON 2018
#define IDC_SHADEBUTTON 2019
// Hardware Renderer Settings:
#define IDC_PALTEX 2030
#define IDC_LARGE_FB 2031
@ -52,11 +52,14 @@
// PSX:
#define IDD_GPUCONFIG 2070
#define IDC_ASPECTRATIO 2071
#define IDC_DITHERING 2072
#define IDC_WINDOWED 2073
#define IDC_RESOLUTION_TEXT 2074
#define IDC_RESOLUTION 2075
#define IDC_SCALE 2076
#define IDC_ASPECTRATIO_TEXT 2072
#define IDC_DITHERING 2073
#define IDC_DITHERING_TEXT 2074
#define IDC_WINDOWED 2075
#define IDC_RESOLUTION 2076
#define IDC_RESOLUTION_TEXT 2077
#define IDC_SCALE 2078
#define IDC_SCALE_TEXT 2079
// Capture:
#define IDD_CAPTURE 2090
#define IDC_FILENAME 2091
@ -71,30 +74,30 @@
#define IDC_ALPHAHACK 2101
#define IDC_OFFSETHACK 2102
#define IDC_OFFSETHACK_TEXT 2103
#define IDC_SPRITEHACK 2106
#define IDC_SPRITEHACK_TEXT 2107
#define IDC_ALPHASTENCIL 2110
#define IDC_TCOFFSETX 2111
#define IDC_TCOFFSETX2 2112
#define IDC_TCOFFSETY 2113
#define IDC_TCOFFSETY2 2114
#define IDC_ROUND_SPRITE 2115
#define IDC_ROUND_SPRITE_TEXT 2116
#define IDC_ALIGN_SPRITE 2117
#define IDC_TC_DEPTH 2118
#define IDC_PRELOAD_GS 2119
#define IDC_FAST_TC_INV 2120
#define IDC_AUTO_FLUSH 2121
#define IDC_MEMORY_WRAPPING 2122
#define IDC_TRI_FILTER 2123
#define IDC_TRI_FILTER_TEXT 2124
#define IDC_SAFE_FEATURES 2125
#define IDC_MERGE_PP_SPRITE 2126
#define IDC_CPU_FB_CONVERSION 2127
#define IDC_SKIPDRAWHACK 2128
#define IDC_SKIPDRAWHACKEDIT 2129
#define IDC_SKIPDRAWOFFSET 2130
#define IDC_SKIPDRAWOFFSETEDIT 2131
#define IDC_SPRITEHACK 2104
#define IDC_SPRITEHACK_TEXT 2105
#define IDC_ALPHASTENCIL 2106
#define IDC_TCOFFSETX 2107
#define IDC_TCOFFSETX2 2108
#define IDC_TCOFFSETY 2109
#define IDC_TCOFFSETY2 2110
#define IDC_ROUND_SPRITE 2111
#define IDC_ROUND_SPRITE_TEXT 2112
#define IDC_ALIGN_SPRITE 2113
#define IDC_TC_DEPTH 2114
#define IDC_PRELOAD_GS 2115
#define IDC_FAST_TC_INV 2116
#define IDC_AUTO_FLUSH 2117
#define IDC_MEMORY_WRAPPING 2118
#define IDC_TRI_FILTER 2119
#define IDC_TRI_FILTER_TEXT 2120
#define IDC_SAFE_FEATURES 2121
#define IDC_MERGE_PP_SPRITE 2122
#define IDC_CPU_FB_CONVERSION 2123
#define IDC_SKIPDRAWHACK 2124
#define IDC_SKIPDRAWHACKEDIT 2125
#define IDC_SKIPDRAWOFFSET 2126
#define IDC_SKIPDRAWOFFSETEDIT 2127
// Shader:
#define IDC_SHADEBOOST 2140
#define IDC_FXAA 2141