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

gsdx-gui: Purge the aout (Alpha hack) from the gui, will be useless with fbmask emulation, enable blending option on d3d11. 

Blending option allows us to toggle fbmask on or off with at least basic
level just like on gl.
This commit is contained in:
lightningterror 2019-04-17 21:30:16 +02:00
parent de5e9a85bb
commit e72aa23436
6 changed files with 38 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/GSdx/GSdx.cpp
View File

@ -438,7 +438,6 @@ void GSdxApp::Init()
m_default_configuration["UserHacks_align_sprite_X"] = "0"; m_default_configuration["UserHacks_align_sprite_X"] = "0";
#ifdef _WIN32 #ifdef _WIN32
// Direct3D only hacks. // Direct3D only hacks.
m_default_configuration["UserHacks_AlphaHack"] = "0";
m_default_configuration["UserHacks_AlphaStencil"] = "0"; m_default_configuration["UserHacks_AlphaStencil"] = "0";
#endif #endif
m_default_configuration["UserHacks_AutoFlush"] = "0"; m_default_configuration["UserHacks_AutoFlush"] = "0";

9
plugins/GSdx/GSdx.rc
View File

@ -120,11 +120,10 @@ BEGIN
GROUPBOX "Hacks",IDC_STATIC,7,7,196,186,0,WS_EX_TRANSPARENT GROUPBOX "Hacks",IDC_STATIC,7,7,196,186,0,WS_EX_TRANSPARENT
// Column one - HW Hacks // Column one - HW Hacks
CONTROL "Align Sprite",IDC_ALIGN_SPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,19,58,8 CONTROL "Align Sprite",IDC_ALIGN_SPRITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,19,58,8
CONTROL "Alpha",IDC_ALPHAHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,32,34,8 CONTROL "Alpha Stencil",IDC_ALPHASTENCIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,32,57,8
CONTROL "Alpha Stencil",IDC_ALPHASTENCIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,45,57,8 CONTROL "Auto Flush",IDC_AUTO_FLUSH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,45,55,8
CONTROL "Auto Flush",IDC_AUTO_FLUSH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,58,55,8 CONTROL "Disable Depth Emulation",IDC_TC_DEPTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,58,92,8
CONTROL "Disable Depth Emulation",IDC_TC_DEPTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,71,92,8 CONTROL "Disable Safe Features",IDC_SAFE_FEATURES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,71,85,8
CONTROL "Disable Safe Features",IDC_SAFE_FEATURES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,84,85,8
// Column two - HW hacks // Column two - HW hacks
CONTROL "Fast Texture Invalidation",IDC_FAST_TC_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,19,92,8 CONTROL "Fast Texture Invalidation",IDC_FAST_TC_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,19,92,8
CONTROL "Frame Buffer Conversion",IDC_CPU_FB_CONVERSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,32,92,8 CONTROL "Frame Buffer Conversion",IDC_CPU_FB_CONVERSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,32,92,8

5
plugins/GSdx/Window/GSSetting.cpp
View File

@ -64,8 +64,6 @@ const char* dialog_message(int ID, bool* updateText) {
"Step 1: Increase the value in the left box and keep the value in the right box set to the same value as the left box to find and remove a bad effect.\n" "Step 1: Increase the value in the left box and keep the value in the right box set to the same value as the left box to find and remove a bad effect.\n"
"Step 2: If a bad effect found with Step 1 is not completely removed yet, then without changing the value in the left box, try increasing the value in the box to right until the effect is completely gone.\n\n" "Step 2: If a bad effect found with Step 1 is not completely removed yet, then without changing the value in the left box, try increasing the value in the box to right until the effect is completely gone.\n\n"
"Note: Increase the value in the right box and keep the value in the left box set to \"1\" to reproduce the old skipdraw behaviour."; "Note: Increase the value in the right box and keep the value in the left box set to \"1\" to reproduce the old skipdraw behaviour.";
case IDC_ALPHAHACK:
return "Different alpha handling. Can work around some shadow problems.";
case IDC_OFFSETHACK: case IDC_OFFSETHACK:
return "Might fix some misaligned fog, bloom, or blend effect.\n" return "Might fix some misaligned fog, bloom, or blend effect.\n"
"The preferred option is Normal (Vertex) as it is most likely to resolve misalignment issues.\n" "The preferred option is Normal (Vertex) as it is most likely to resolve misalignment issues.\n"
@ -123,7 +121,8 @@ const char* dialog_message(int ID, bool* updateText) {
"Full:\nExcept few cases, the blending unit will be fully emulated by the shader. It is ultra slow!\n" "Full:\nExcept few cases, the blending unit will be fully emulated by the shader. It is ultra slow!\n"
"It is intended for debug.\n\n" "It is intended for debug.\n\n"
"Ultra:\nThe blending unit will be completely emulated by the shader. It is ultra slow!\n" "Ultra:\nThe blending unit will be completely emulated by the shader. It is ultra slow!\n"
"It is intended for debug."; "It is intended for debug.\n\n"
"Note: Blending is very limited on Direct3D and only Basic mode is partially available.";
case IDC_TC_DEPTH: case IDC_TC_DEPTH:
return "Disable the support of Depth buffer in the texture cache.\n" return "Disable the support of Depth buffer in the texture cache.\n"
"It can help to increase speed but it will likely create various glitches."; "It can help to increase speed but it will likely create various glitches.";

1
plugins/GSdx/Window/GSSetting.h
View File

@ -48,7 +48,6 @@ enum {
IDC_SKIPDRAWHACKEDIT, IDC_SKIPDRAWHACKEDIT,
IDC_SKIPDRAWOFFSET, IDC_SKIPDRAWOFFSET,
IDC_SKIPDRAWOFFSETEDIT, IDC_SKIPDRAWOFFSETEDIT,
IDC_ALPHAHACK,
IDC_OFFSETHACK, IDC_OFFSETHACK,
IDC_SPRITEHACK, IDC_SPRITEHACK,
IDC_WILDHACK, IDC_WILDHACK,

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

@ -383,10 +383,8 @@ void GSSettingsDlg::UpdateControls()
} }
EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_DATE), hw); EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_DATE), hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_DATE_TEXT), hw); EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_DATE_TEXT), hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_BLEND_UNIT), ogl && hw); EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_BLEND_UNIT), hw);
EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_BLEND_UNIT_TEXT), ogl && hw); EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_BLEND_UNIT_TEXT), hw);
ShowWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_BLEND_UNIT), ogl ? SW_SHOW : SW_HIDE);
ShowWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_BLEND_UNIT_TEXT), ogl ? SW_SHOW : SW_HIDE);
// Software mode settings // Software mode settings
EnableWindow(GetDlgItem(m_hWnd, IDC_MIPMAP_SW), sw); EnableWindow(GetDlgItem(m_hWnd, IDC_MIPMAP_SW), sw);
@ -615,7 +613,6 @@ void GSHacksDlg::OnInit()
bool ogl = renderer == GSRendererType::OGL_HW; bool ogl = renderer == GSRendererType::OGL_HW;
bool native = upscaling_multiplier == 1; bool native = upscaling_multiplier == 1;
CheckDlgButton(m_hWnd, IDC_ALPHAHACK, theApp.GetConfigB("UserHacks_AlphaHack"));
CheckDlgButton(m_hWnd, IDC_WILDHACK, theApp.GetConfigB("UserHacks_WildHack")); CheckDlgButton(m_hWnd, IDC_WILDHACK, theApp.GetConfigB("UserHacks_WildHack"));
CheckDlgButton(m_hWnd, IDC_ALPHASTENCIL, theApp.GetConfigB("UserHacks_AlphaStencil")); CheckDlgButton(m_hWnd, IDC_ALPHASTENCIL, theApp.GetConfigB("UserHacks_AlphaStencil"));
CheckDlgButton(m_hWnd, IDC_PRELOAD_GS, theApp.GetConfigB("preload_frame_with_gs_data")); CheckDlgButton(m_hWnd, IDC_PRELOAD_GS, theApp.GetConfigB("preload_frame_with_gs_data"));
@ -673,7 +670,6 @@ void GSHacksDlg::OnInit()
// Direct3D-only hacks: // Direct3D-only hacks:
EnableWindow(GetDlgItem(m_hWnd, IDC_ALPHASTENCIL), !ogl); EnableWindow(GetDlgItem(m_hWnd, IDC_ALPHASTENCIL), !ogl);
EnableWindow(GetDlgItem(m_hWnd, IDC_ALPHAHACK), !ogl);
// OpenGL-only hacks: // OpenGL-only hacks:
EnableWindow(GetDlgItem(m_hWnd, IDC_TRI_FILTER), hwhacks && ogl); EnableWindow(GetDlgItem(m_hWnd, IDC_TRI_FILTER), hwhacks && ogl);
@ -702,7 +698,6 @@ void GSHacksDlg::OnInit()
AddTooltip(IDC_SKIPDRAWHACK); AddTooltip(IDC_SKIPDRAWHACK);
AddTooltip(IDC_SKIPDRAWOFFSETEDIT); AddTooltip(IDC_SKIPDRAWOFFSETEDIT);
AddTooltip(IDC_SKIPDRAWOFFSET); AddTooltip(IDC_SKIPDRAWOFFSET);
AddTooltip(IDC_ALPHAHACK);
AddTooltip(IDC_OFFSETHACK); AddTooltip(IDC_OFFSETHACK);
AddTooltip(IDC_SPRITEHACK); AddTooltip(IDC_SPRITEHACK);
AddTooltip(IDC_WILDHACK); AddTooltip(IDC_WILDHACK);
@ -813,7 +808,6 @@ bool GSHacksDlg::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
theApp.SetConfig("UserHacks_SkipDraw_Offset", std::min(skipdraw_offset, skipdraw)); theApp.SetConfig("UserHacks_SkipDraw_Offset", std::min(skipdraw_offset, skipdraw));
theApp.SetConfig("UserHacks_SkipDraw", skipdraw); theApp.SetConfig("UserHacks_SkipDraw", skipdraw);
theApp.SetConfig("UserHacks_AlphaHack", (int)IsDlgButtonChecked(m_hWnd, IDC_ALPHAHACK));
theApp.SetConfig("UserHacks_WildHack", (int)IsDlgButtonChecked(m_hWnd, IDC_WILDHACK)); theApp.SetConfig("UserHacks_WildHack", (int)IsDlgButtonChecked(m_hWnd, IDC_WILDHACK));
theApp.SetConfig("UserHacks_AlphaStencil", (int)IsDlgButtonChecked(m_hWnd, IDC_ALPHASTENCIL)); theApp.SetConfig("UserHacks_AlphaStencil", (int)IsDlgButtonChecked(m_hWnd, IDC_ALPHASTENCIL));
theApp.SetConfig("preload_frame_with_gs_data", (int)IsDlgButtonChecked(m_hWnd, IDC_PRELOAD_GS)); theApp.SetConfig("preload_frame_with_gs_data", (int)IsDlgButtonChecked(m_hWnd, IDC_PRELOAD_GS));

61
plugins/GSdx/resource.h
View File

@ -71,37 +71,36 @@
#define IDC_COLORSPACE 2097 #define IDC_COLORSPACE 2097
// Hardware Hacks: // Hardware Hacks:
#define IDC_WILDHACK 2100 #define IDC_WILDHACK 2100
#define IDC_ALPHAHACK 2101 #define IDC_OFFSETHACK 2101
#define IDC_OFFSETHACK 2102 #define IDC_OFFSETHACK_TEXT 2102
#define IDC_OFFSETHACK_TEXT 2103 #define IDC_SPRITEHACK 2103
#define IDC_SPRITEHACK 2104 #define IDC_SPRITEHACK_TEXT 2104
#define IDC_SPRITEHACK_TEXT 2105 #define IDC_ALPHASTENCIL 2105
#define IDC_ALPHASTENCIL 2106 #define IDC_TCOFFSETX 2106
#define IDC_TCOFFSETX 2107 #define IDC_TCOFFSETX2 2107
#define IDC_TCOFFSETX2 2108 #define IDC_TCOFFSETX_TEXT 2108
#define IDC_TCOFFSETX_TEXT 2109 #define IDC_TCOFFSETY 2109
#define IDC_TCOFFSETY 2110 #define IDC_TCOFFSETY2 2110
#define IDC_TCOFFSETY2 2111 #define IDC_TCOFFSETY_TEXT 2111
#define IDC_TCOFFSETY_TEXT 2112 #define IDC_TCOFFSET_TEXT 2112
#define IDC_TCOFFSET_TEXT 2113 #define IDC_ROUND_SPRITE 2113
#define IDC_ROUND_SPRITE 2114 #define IDC_ROUND_SPRITE_TEXT 2114
#define IDC_ROUND_SPRITE_TEXT 2115 #define IDC_ALIGN_SPRITE 2115
#define IDC_ALIGN_SPRITE 2116 #define IDC_TC_DEPTH 2116
#define IDC_TC_DEPTH 2117 #define IDC_PRELOAD_GS 2117
#define IDC_PRELOAD_GS 2118 #define IDC_FAST_TC_INV 2118
#define IDC_FAST_TC_INV 2119 #define IDC_AUTO_FLUSH 2119
#define IDC_AUTO_FLUSH 2120 #define IDC_MEMORY_WRAPPING 2120
#define IDC_MEMORY_WRAPPING 2121 #define IDC_TRI_FILTER 2121
#define IDC_TRI_FILTER 2122 #define IDC_TRI_FILTER_TEXT 2122
#define IDC_TRI_FILTER_TEXT 2123 #define IDC_SAFE_FEATURES 2123
#define IDC_SAFE_FEATURES 2124 #define IDC_MERGE_PP_SPRITE 2124
#define IDC_MERGE_PP_SPRITE 2125 #define IDC_CPU_FB_CONVERSION 2125
#define IDC_CPU_FB_CONVERSION 2126 #define IDC_SKIPDRAWHACK 2126
#define IDC_SKIPDRAWHACK 2127 #define IDC_SKIPDRAWHACK_TEXT 2127
#define IDC_SKIPDRAWHACK_TEXT 2128 #define IDC_SKIPDRAWHACKEDIT 2128
#define IDC_SKIPDRAWHACKEDIT 2129 #define IDC_SKIPDRAWOFFSET 2129
#define IDC_SKIPDRAWOFFSET 2130 #define IDC_SKIPDRAWOFFSETEDIT 2130
#define IDC_SKIPDRAWOFFSETEDIT 2131
// Shader: // Shader:
#define IDC_SHADEBOOST 2140 #define IDC_SHADEBOOST 2140
#define IDC_FXAA 2141 #define IDC_FXAA 2141