mirror of https://github.com/PCSX2/pcsx2.git
GSdx-gui: Revert spacing between Texture filtering and Hardware settings.
I forgot all about OpenCL which caused some overlapping with the OpenCL device option.
This commit is contained in:
parent
51cf02d27b
commit
fc1d88cb51
|
@ -276,7 +276,7 @@ BEGIN
|
||||||
CONTROL "Windowed",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,129,157,49,10
|
CONTROL "Windowed",IDC_WINDOWED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,129,157,49,10
|
||||||
END
|
END
|
||||||
|
|
||||||
IDD_CONFIG DIALOGEX 0, 0, 243, 379
|
IDD_CONFIG DIALOGEX 0, 0, 243, 387
|
||||||
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
|
||||||
|
@ -297,43 +297,43 @@ BEGIN
|
||||||
COMBOBOX IDC_FILTER,71,100,166,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_FILTER,71,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,71,115,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_OPENCL_DEVICE,71,115,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
PUSHBUTTON "Shader Configuration",IDC_SHADEBUTTON,124,333,107,14
|
PUSHBUTTON "Shader Configuration",IDC_SHADEBUTTON,124,341,107,14
|
||||||
PUSHBUTTON "OSD Configuration",IDC_OSDBUTTON,11,333,107,14
|
PUSHBUTTON "OSD Configuration",IDC_OSDBUTTON,11,341,107,14
|
||||||
DEFPUSHBUTTON "OK",IDOK,69,359,50,14
|
DEFPUSHBUTTON "OK",IDOK,69,367,50,14
|
||||||
PUSHBUTTON "Cancel",IDCANCEL,125,359,50,14
|
PUSHBUTTON "Cancel",IDCANCEL,125,367,50,14
|
||||||
// Hardware Renderer Settings:
|
// Hardware Renderer Settings:
|
||||||
GROUPBOX "Hardware Renderer Settings",IDC_STATIC,6,124,231,155,BS_CENTER
|
GROUPBOX "Hardware Renderer Settings",IDC_STATIC,6,132,231,155,BS_CENTER
|
||||||
CONTROL "Allow 8-Bit Textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,136,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,105,136,90,10
|
CONTROL "Large Framebuffer",IDC_LARGE_FB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,144,90,10
|
||||||
LTEXT "Internal Resolution:",IDC_UPSCALE_MULTIPLIER_TEXT,22,152,79,8
|
LTEXT "Internal Resolution:",IDC_UPSCALE_MULTIPLIER_TEXT,22,160,79,8
|
||||||
COMBOBOX IDC_UPSCALE_MULTIPLIER,105,150,127,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_UPSCALE_MULTIPLIER,105,158,127,98,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
LTEXT "Custom Resolution:",IDC_CUSTOM_TEXT,22,168,79,8
|
LTEXT "Custom Resolution:",IDC_CUSTOM_TEXT,22,176,79,8
|
||||||
EDITTEXT IDC_RESX_EDIT,105,166,61,13,ES_AUTOHSCROLL | ES_NUMBER
|
EDITTEXT IDC_RESX_EDIT,105,174,61,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||||
CONTROL "",IDC_RESX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,145,166,11,14
|
CONTROL "",IDC_RESX,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,145,174,11,14
|
||||||
EDITTEXT IDC_RESY_EDIT,171,166,61,13,ES_AUTOHSCROLL | ES_NUMBER
|
EDITTEXT IDC_RESY_EDIT,171,174,61,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||||
CONTROL "",IDC_RESY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,221,166,11,14
|
CONTROL "",IDC_RESY,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,221,174,11,14
|
||||||
LTEXT "Anisotropic Filtering:",IDC_AFCOMBO_TEXT,22,184,79,8
|
LTEXT "Anisotropic Filtering:",IDC_AFCOMBO_TEXT,22,192,79,8
|
||||||
COMBOBOX IDC_AFCOMBO,105,182,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_AFCOMBO,105,190,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
LTEXT "Mipmapping (Ins):",IDC_MIPMAP_HW_TEXT,22,200,79,8
|
LTEXT "Mipmapping (Ins):",IDC_MIPMAP_HW_TEXT,22,208,79,8
|
||||||
COMBOBOX IDC_MIPMAP_HW,105,198,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_MIPMAP_HW,105,206,127,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
LTEXT "CRC Hack Level:",IDC_CRC_LEVEL_TEXT,22,216,79,8
|
LTEXT "CRC Hack Level:",IDC_CRC_LEVEL_TEXT,22,224,79,8
|
||||||
COMBOBOX IDC_CRC_LEVEL,105,214,127,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_CRC_LEVEL,105,222,127,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
CONTROL "Enable HW Hacks",IDC_HACKS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,232,71,10
|
CONTROL "Enable HW Hacks",IDC_HACKS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,240,71,10
|
||||||
PUSHBUTTON "Advanced Settings and Hacks",IDC_HACKSBUTTON,105,230,127,14
|
PUSHBUTTON "Advanced Settings and Hacks",IDC_HACKSBUTTON,105,238,127,14
|
||||||
// OpenGL (Hardware) Settings:
|
// OpenGL (Hardware) Settings:
|
||||||
CONTROL "Accurate Date",IDC_ACCURATE_DATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,248,72,8
|
CONTROL "Accurate Date",IDC_ACCURATE_DATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,256,72,8
|
||||||
LTEXT "Blending Unit Accuracy:",IDC_ACCURATE_BLEND_UNIT_TEXT,22,264,79,10
|
LTEXT "Blending Unit Accuracy:",IDC_ACCURATE_BLEND_UNIT_TEXT,22,272,79,10
|
||||||
COMBOBOX IDC_ACCURATE_BLEND_UNIT,105,262,127,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
COMBOBOX IDC_ACCURATE_BLEND_UNIT,105,270,127,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||||
// Direct3D 9 (Hardware) Settings:
|
// Direct3D 9 (Hardware) Settings:
|
||||||
CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,248,90,8
|
CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,256,90,8
|
||||||
CONTROL "Alpha Correction",IDC_FBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,248,74,8
|
CONTROL "Alpha Correction",IDC_FBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,256,74,8
|
||||||
// Software Renderer Settings:
|
// Software Renderer Settings:
|
||||||
GROUPBOX "Software Renderer Settings",IDC_STATIC,6,287,231,40,BS_CENTER
|
GROUPBOX "Software Renderer Settings",IDC_STATIC,6,295,231,40,BS_CENTER
|
||||||
CONTROL "Edge Anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,298,91,10
|
CONTROL "Edge Anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,306,91,10
|
||||||
LTEXT "Rendering threads:",IDC_SWTHREADS_TEXT,124,299,80,8
|
LTEXT "Rendering threads:",IDC_SWTHREADS_TEXT,124,307,80,8
|
||||||
EDITTEXT IDC_SWTHREADS_EDIT,198,297,34,13,ES_AUTOHSCROLL | ES_NUMBER
|
EDITTEXT IDC_SWTHREADS_EDIT,198,305,34,13,ES_AUTOHSCROLL | ES_NUMBER
|
||||||
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,221,296,11,14
|
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,221,304,11,14
|
||||||
CONTROL "Mipmapping",IDC_MIPMAP_SW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,314,90,8
|
CONTROL "Mipmapping",IDC_MIPMAP_SW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,322,90,8
|
||||||
END
|
END
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue