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

Merge pull request #1217 from PCSX2-Alpha/CRTC_option 

GSDX : Add an option for CRTC size and some other video mode stuffs
This commit is contained in:
Gregory Hainaut 2016-04-07 21:24:46 +02:00
parent 17886a9808 3dd8574e33
commit 8ccdc05c08
4 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcsx2/R5900OpcodeImpl.cpp
View File

@ -913,14 +913,15 @@ void SYSCALL()
case 0x50: mode = "HDTV 720x480 @ 59.94"; break;
case 0x51: mode = "HDTV 1920x1080 @ 60.00"; break;
case 0x52: mode = "HDTV 1280x720 @ ??.???"; break;
// TODO: Videomodetest.ELF reported 0x53 and 0x54 for two video modes. however no info on the docs.
case 0x53: mode = "HDTV 768x576 @ ??.???"; break;
case 0x54: mode = "HDTV 1920x1080 @ ??.???"; break;
case 0x72: mode = "DVD NTSC 640x448 @ ??.???"; break;
case 0x73: mode = "DVD PAL/480P 720x480 @ ??.???"; break;
default: DevCon.Error("Mode %x is not supported. Report me upstream", cpuRegs.GPR.n.a1.UC[0]);
default: Console.Error("Mode %x is not supported. Report me upstream", cpuRegs.GPR.n.a1.UC[0]);
}
DevCon.Warning("Set GS CRTC configuration. Interlace %s. Field Type %s. Mode %s", inter, field, mode.c_str());
Console.Warning("Set GS CRTC configuration. Interlace %s. Field Type %s. Mode %s", inter, field, mode.c_str());
}
break;

3
plugins/GSdx/GSSettingsDlg.cpp
View File

@ -676,7 +676,8 @@ void GSHacksDlg::OnInit()
ShowWindow(GetDlgItem(m_hWnd, IDC_ALPHASTENCIL), ogl ? SW_HIDE : SW_SHOW);
ShowWindow(GetDlgItem(m_hWnd, IDC_ALPHAHACK), ogl ? SW_HIDE : SW_SHOW);
ShowWindow(GetDlgItem(m_hWnd, IDC_SAFE_FBMASK), ogl ? SW_SHOW : SW_HIDE);
EnableWindow(GetDlgItem(m_hWnd, IDC_MSAACB), !ogl);
EnableWindow(GetDlgItem(m_hWnd, IDC_MSAA_TEXT), !ogl);
AddTooltip(IDC_SKIPDRAWHACKEDIT);
AddTooltip(IDC_SKIPDRAWHACK);

2
plugins/GSdx/GSdx.rc
View File

@ -97,7 +97,7 @@ BEGIN
DEFPUSHBUTTON "OK",IDOK,88,181,66,14
GROUPBOX "USE AT YOUR OWN RISK!",IDC_STATIC,7,7,147,171,0,WS_EX_TRANSPARENT
CONTROL "Preload Data Frame",IDC_PRELOAD_GS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,95,80,8
RTEXT "MSAA:",IDC_STATIC,62,20,22,8
RTEXT "MSAA:",IDC_MSAA_TEXT,62,20,22,8
RTEXT "Skipdraw:",IDC_STATIC,52,36,32,8
EDITTEXT IDC_SKIPDRAWHACKEDIT,88,33,58,14,ES_RIGHT | ES_AUTOHSCROLL
CONTROL "",IDC_SKIPDRAWHACK,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,113,34,11,14

73
plugins/GSdx/resource.h
View File

@ -55,41 +55,42 @@
#define IDC_BRIGHTNESS_TEXT 2050
#define IDC_CONTRAST_TEXT 2051
#define IDC_MSAACB 2052
#define IDC_HACKSBUTTON 2053
#define IDC_WILDHACK 2054
#define IDC_CHECK_DISABLE_ALL_HACKS 2055
#define IDC_ALPHASTENCIL 2056
#define IDC_ADAPTER 2057
#define IDC_TCOFFSETX 2058
#define IDC_TCOFFSETX2 2059
#define IDC_TCOFFSETY 2060
#define IDC_TCOFFSETY2 2061
#define IDC_FXAA 2062
#define IDC_SHADER_FX 2063
#define IDC_AFCOMBO_TEXT 2064
#define IDC_AFCOMBO 2065
#define IDC_OPENCL_DEVICE 2066
#define IDC_OPENCL_TEXT 2067
#define IDC_ACCURATE_BLEND_UNIT 2068
#define IDC_ACCURATE_DATE 2069
#define IDC_ROUND_SPRITE 2070
#define IDC_ALIGN_SPRITE 2071
#define IDC_CRC_LEVEL 2072
#define IDC_CRC_LEVEL_TEXT 2073
#define IDC_TC_DEPTH 2074
#define IDC_COLORSPACE 2075
#define IDC_SHADER_FX_EDIT 2076
#define IDC_SHADER_FX_CONF_EDIT 2077
#define IDC_SHADER_FX_BUTTON 2078
#define IDC_SHADER_FX_CONF_BUTTON 2079
#define IDC_SHADER_FX_TEXT 2080
#define IDC_SHADER_FX_CONF_TEXT 2081
#define IDC_CUSTOM_TEXT 2082
#define IDC_UPSCALE_MULTIPLIER_TEXT 2083
#define IDC_MIPMAP 2084
#define IDC_PRELOAD_GS 2085
#define IDC_TVSHADER 2086
#define IDC_SAFE_FBMASK 2087
#define IDC_MSAA_TEXT 2053
#define IDC_HACKSBUTTON 2054
#define IDC_WILDHACK 2055
#define IDC_CHECK_DISABLE_ALL_HACKS 2056
#define IDC_ALPHASTENCIL 2057
#define IDC_ADAPTER 2058
#define IDC_TCOFFSETX 2059
#define IDC_TCOFFSETX2 2060
#define IDC_TCOFFSETY 2061
#define IDC_TCOFFSETY2 2062
#define IDC_FXAA 2063
#define IDC_SHADER_FX 2064
#define IDC_AFCOMBO_TEXT 2065
#define IDC_AFCOMBO 2066
#define IDC_OPENCL_DEVICE 2067
#define IDC_OPENCL_TEXT 2068
#define IDC_ACCURATE_BLEND_UNIT 2069
#define IDC_ACCURATE_DATE 2070
#define IDC_ROUND_SPRITE 2071
#define IDC_ALIGN_SPRITE 2072
#define IDC_CRC_LEVEL 2073
#define IDC_CRC_LEVEL_TEXT 2074
#define IDC_TC_DEPTH 2075
#define IDC_COLORSPACE 2076
#define IDC_SHADER_FX_EDIT 2077
#define IDC_SHADER_FX_CONF_EDIT 2078
#define IDC_SHADER_FX_BUTTON 2079
#define IDC_SHADER_FX_CONF_BUTTON 2080
#define IDC_SHADER_FX_TEXT 2081
#define IDC_SHADER_FX_CONF_TEXT 2082
#define IDC_CUSTOM_TEXT 2083
#define IDC_UPSCALE_MULTIPLIER_TEXT 2084
#define IDC_MIPMAP 2085
#define IDC_PRELOAD_GS 2086
#define IDC_TVSHADER 2087
#define IDC_SAFE_FBMASK 2088
#define IDR_CONVERT_FX 10000
#define IDR_TFX_FX 10001
#define IDR_MERGE_FX 10002
@ -108,7 +109,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 10013
#define _APS_NEXT_COMMAND_VALUE 32771
#define _APS_NEXT_CONTROL_VALUE 2088
#define _APS_NEXT_CONTROL_VALUE 2091
#define _APS_NEXT_SYMED_VALUE 5000
#endif
#endif