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

Merge pull request #1055 from ssakash/gsdx_dlgelement_changes 

GSDX: disable SW mode options on hardware renderer
This commit is contained in:
ramapcsx2 2015-12-23 10:39:09 +01:00
parent e5535ccc8f acb82389c8
commit f4dcb35bc8
3 changed files with 88 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/GSdx/GSSettingsDlg.cpp
View File

@ -358,7 +358,7 @@ void GSSettingsDlg::UpdateControls()
bool ogl = renderer == GSRendererType::OGL_HW || renderer == GSRendererType::OGL_SW || renderer == GSRendererType::OGL_OpenCL; bool ogl = renderer == GSRendererType::OGL_HW || renderer == GSRendererType::OGL_SW || renderer == GSRendererType::OGL_OpenCL;
bool hw = renderer == GSRendererType::DX9_HW || renderer == GSRendererType::DX1011_HW || renderer == GSRendererType::OGL_HW || renderer == GSRendererType::Null_HW; bool hw = renderer == GSRendererType::DX9_HW || renderer == GSRendererType::DX1011_HW || renderer == GSRendererType::OGL_HW || renderer == GSRendererType::Null_HW;
//bool sw = renderer == GSRendererType::DX9_SW || renderer == GSRendererType::DX1011_SW || renderer == GSRendererType::OGL_SW || renderer == GSRendererType::Null_SW bool sw = renderer == GSRendererType::DX9_SW || renderer == GSRendererType::DX1011_SW || renderer == GSRendererType::OGL_SW || renderer == GSRendererType::Null_SW;
bool ocl = renderer == GSRendererType::DX9_OpenCL || renderer == GSRendererType::DX1011_OpenCL || renderer == GSRendererType::Null_OpenCL || renderer == GSRendererType::OGL_OpenCL; bool ocl = renderer == GSRendererType::DX9_OpenCL || renderer == GSRendererType::DX1011_OpenCL || renderer == GSRendererType::Null_OpenCL || renderer == GSRendererType::OGL_OpenCL;
ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO9), dx9 ? SW_SHOW : SW_HIDE); ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO9), dx9 ? SW_SHOW : SW_HIDE);
@ -404,9 +404,12 @@ void GSSettingsDlg::UpdateControls()
EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_BLEND_UNIT_TEXT), ogl && hw); EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_BLEND_UNIT_TEXT), ogl && hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_TC_DEPTH), ogl && hw); EnableWindow(GetDlgItem(m_hWnd, IDC_TC_DEPTH), ogl && hw);
//EnableWindow(GetDlgItem(m_hWnd, IDC_AA1), sw); // Let uers set software params regardless of renderer used // Software mode settings
//EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS_EDIT), sw); EnableWindow(GetDlgItem(m_hWnd, IDC_AA1), sw);
//EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS), sw); EnableWindow(GetDlgItem(m_hWnd, IDC_MIPMAP), sw);
EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS_TEXT), sw);
EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS_EDIT), sw);
EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS), sw);
// Hacks // Hacks
EnableWindow(GetDlgItem(m_hWnd, IDC_HACKS_ENABLED), hw); EnableWindow(GetDlgItem(m_hWnd, IDC_HACKS_ENABLED), hw);

2
plugins/GSdx/GSdx.rc
View File

@ -236,7 +236,7 @@ BEGIN
CONTROL "Mipmapping",IDC_MIPMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,304,90,8 CONTROL "Mipmapping",IDC_MIPMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,304,90,8
GROUPBOX "Software Mode Settings",IDC_STATIC,6,275,231,40,BS_CENTER GROUPBOX "Software Mode Settings",IDC_STATIC,6,275,231,40,BS_CENTER
CONTROL "Edge Anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,287,91,10 CONTROL "Edge Anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,287,91,10
LTEXT "Extra rendering threads:",IDC_STATIC,116,288,83,8 LTEXT "Extra rendering threads:",IDC_SWTHREADS_TEXT,116,288,83,8
EDITTEXT IDC_SWTHREADS_EDIT,198,286,34,13,ES_AUTOHSCROLL | ES_NUMBER EDITTEXT IDC_SWTHREADS_EDIT,198,286,34,13,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,221,285,11,14 CONTROL "",IDC_SWTHREADS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,221,285,11,14
PUSHBUTTON "Configure",IDC_SHADEBUTTON,105,323,127,14 PUSHBUTTON "Configure",IDC_SHADEBUTTON,105,323,127,14

159
plugins/GSdx/resource.h
View File

@ -10,84 +10,85 @@
#define IDC_RESX_EDIT 2005 #define IDC_RESX_EDIT 2005
#define IDC_RESY_EDIT 2006 #define IDC_RESY_EDIT 2006
#define IDC_AA1 2007 #define IDC_AA1 2007
#define IDC_SWTHREADS_EDIT 2008 #define IDC_SWTHREADS_TEXT 2008
#define IDC_FILTER_TEXT 2009 #define IDC_SWTHREADS 2009
#define IDC_FILTER 2010 #define IDC_SWTHREADS_EDIT 2010
#define IDC_DITHERING 2011 #define IDC_FILTER_TEXT 2011
#define IDC_RESX 2012 #define IDC_FILTER 2012
#define IDC_RESY 2013 #define IDC_DITHERING 2013
#define IDD_CONFIG 2014 #define IDC_RESX 2014
#define IDB_LOGO9 2015 #define IDC_RESY 2015
#define IDB_LOGO10 2016 #define IDD_CONFIG 2016
#define IDB_LOGOGL 2017 #define IDB_LOGO9 2017
#define IDC_FBA 2018 #define IDB_LOGO10 2018
#define IDC_LOGO9 2019 #define IDB_LOGOGL 2019
#define IDC_LOGO11 2020 #define IDC_FBA 2020
#define IDC_LOGOGL 2021 #define IDC_LOGO9 2021
#define IDD_CAPTURE 2022 #define IDC_LOGO11 2022
#define IDD_GPUCONFIG 2023 #define IDC_LOGOGL 2023
#define IDC_RENDERER 2024 #define IDD_CAPTURE 2024
#define IDC_INTERLACE 2025 #define IDD_GPUCONFIG 2025
#define IDC_ASPECTRATIO 2026 #define IDC_RENDERER 2026
#define IDC_ALPHAHACK 2027 #define IDC_INTERLACE 2027
#define IDC_SWTHREADS 2028 #define IDC_ASPECTRATIO 2028
#define IDC_SCALE 2029 #define IDC_ALPHAHACK 2029
#define IDC_UPSCALE_MULTIPLIER 2030 #define IDC_SCALE 2030
#define IDC_BROWSE 2031 #define IDC_UPSCALE_MULTIPLIER 2031
#define IDC_OFFSETHACK 2032 #define IDC_BROWSE 2032
#define IDC_FILENAME 2033 #define IDC_OFFSETHACK 2033
#define IDC_SKIPDRAWHACK 2034 #define IDC_FILENAME 2034
#define IDC_WIDTH 2035 #define IDC_SKIPDRAWHACK 2035
#define IDC_HEIGHT 2036 #define IDC_WIDTH 2036
#define IDC_CONFIGURE 2037 #define IDC_HEIGHT 2037
#define IDC_ACCURATE_BLEND_UNIT_TEXT 2038 #define IDC_CONFIGURE 2038
#define IDC_WINDOWED 2039 #define IDC_ACCURATE_BLEND_UNIT_TEXT 2039
#define IDC_SKIPDRAWHACKEDIT 2040 #define IDC_WINDOWED 2040
#define IDC_SPRITEHACK 2041 #define IDC_SKIPDRAWHACKEDIT 2041
#define IDC_SATURATION_SLIDER 2042 #define IDC_SPRITEHACK 2042
#define IDC_BRIGHTNESS_SLIDER 2043 #define IDC_SATURATION_SLIDER 2043
#define IDC_CONTRAST_SLIDER 2044 #define IDC_BRIGHTNESS_SLIDER 2044
#define IDC_SHADEBUTTON 2045 #define IDC_CONTRAST_SLIDER 2045
#define IDC_SHADEBOOST 2046 #define IDC_SHADEBUTTON 2046
#define IDC_HACKS_ENABLED 2047 #define IDC_SHADEBOOST 2047
#define IDC_SATURATION_TEXT 2048 #define IDC_HACKS_ENABLED 2048
#define IDC_BRIGHTNESS_TEXT 2049 #define IDC_SATURATION_TEXT 2049
#define IDC_CONTRAST_TEXT 2050 #define IDC_BRIGHTNESS_TEXT 2050
#define IDC_MSAACB 2051 #define IDC_CONTRAST_TEXT 2051
#define IDC_HACKSBUTTON 2052 #define IDC_MSAACB 2052
#define IDC_WILDHACK 2053 #define IDC_HACKSBUTTON 2053
#define IDC_CHECK_DISABLE_ALL_HACKS 2054 #define IDC_WILDHACK 2054
#define IDC_ALPHASTENCIL 2055 #define IDC_CHECK_DISABLE_ALL_HACKS 2055
#define IDC_ADAPTER 2056 #define IDC_ALPHASTENCIL 2056
#define IDC_TCOFFSETX 2057 #define IDC_ADAPTER 2057
#define IDC_TCOFFSETX2 2058 #define IDC_TCOFFSETX 2058
#define IDC_TCOFFSETY 2059 #define IDC_TCOFFSETX2 2059
#define IDC_TCOFFSETY2 2060 #define IDC_TCOFFSETY 2060
#define IDC_FXAA 2061 #define IDC_TCOFFSETY2 2061
#define IDC_SHADER_FX 2062 #define IDC_FXAA 2062
#define IDC_AFCOMBO_TEXT 2063 #define IDC_SHADER_FX 2063
#define IDC_AFCOMBO 2064 #define IDC_AFCOMBO_TEXT 2064
#define IDC_OPENCL_DEVICE 2065 #define IDC_AFCOMBO 2065
#define IDC_OPENCL_TEXT 2066 #define IDC_OPENCL_DEVICE 2066
#define IDC_ACCURATE_BLEND_UNIT 2067 #define IDC_OPENCL_TEXT 2067
#define IDC_ACCURATE_DATE 2068 #define IDC_ACCURATE_BLEND_UNIT 2068
#define IDC_ROUND_SPRITE 2069 #define IDC_ACCURATE_DATE 2069
#define IDC_ALIGN_SPRITE 2070 #define IDC_ROUND_SPRITE 2070
#define IDC_CRC_LEVEL 2071 #define IDC_ALIGN_SPRITE 2071
#define IDC_CRC_LEVEL_TEXT 2072 #define IDC_CRC_LEVEL 2072
#define IDC_TC_DEPTH 2073 #define IDC_CRC_LEVEL_TEXT 2073
#define IDC_COLORSPACE 2074 #define IDC_TC_DEPTH 2074
#define IDC_SHADER_FX_EDIT 2075 #define IDC_COLORSPACE 2075
#define IDC_SHADER_FX_CONF_EDIT 2076 #define IDC_SHADER_FX_EDIT 2076
#define IDC_SHADER_FX_BUTTON 2077 #define IDC_SHADER_FX_CONF_EDIT 2077
#define IDC_SHADER_FX_CONF_BUTTON 2078 #define IDC_SHADER_FX_BUTTON 2078
#define IDC_SHADER_FX_TEXT 2079 #define IDC_SHADER_FX_CONF_BUTTON 2079
#define IDC_SHADER_FX_CONF_TEXT 2080 #define IDC_SHADER_FX_TEXT 2080
#define IDC_CUSTOM_TEXT 2081 #define IDC_SHADER_FX_CONF_TEXT 2081
#define IDC_UPSCALE_MULTIPLIER_TEXT 2082 #define IDC_CUSTOM_TEXT 2082
#define IDC_MIPMAP 2083 #define IDC_UPSCALE_MULTIPLIER_TEXT 2083
#define IDC_PRELOAD_GS 2084 #define IDC_MIPMAP 2084
#define IDC_TVSHADER 2085 #define IDC_PRELOAD_GS 2085
#define IDC_TVSHADER 2086
#define IDR_CONVERT_FX 10000 #define IDR_CONVERT_FX 10000
#define IDR_TFX_FX 10001 #define IDR_TFX_FX 10001
#define IDR_MERGE_FX 10002 #define IDR_MERGE_FX 10002
@ -106,7 +107,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 10013 #define _APS_NEXT_RESOURCE_VALUE 10013
#define _APS_NEXT_COMMAND_VALUE 32771 #define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 2086 #define _APS_NEXT_CONTROL_VALUE 2087
#define _APS_NEXT_SYMED_VALUE 5000 #define _APS_NEXT_SYMED_VALUE 5000
#endif #endif
#endif #endif