Merge branch 'PCSX2:master' into master

This commit is contained in:
987123879113 2022-08-09 04:42:59 +09:00 committed by GitHub
commit d28b5a37ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 76 additions and 6 deletions

View File

@ -4528,6 +4528,9 @@ SCKA-10006:
SCKA-10007:
name: "EyeToy - Tales"
region: "NTSC-K"
SCKA-20001:
name: "XI Go"
region: "NTSC-K"
SCKA-20003:
name: "War of the Monsters - Kaijuu Daigekisen"
region: "NTSC-K"
@ -6312,6 +6315,8 @@ SCPS-55014:
SCPS-55015:
name: "Zettai Zetsumei Toshi"
region: "NTSC-J"
gsHWFixes:
autoFlush: 1 # Fixes incorrect blur effect.
SCPS-55016:
name: "Jet de Go! 2"
region: "NTSC-J"
@ -6543,6 +6548,11 @@ SCPS-56011:
SCPS-56012:
name: "Raw Danger"
region: "NTSC-K"
gsHWFixes:
autoFlush: 1 # Fixes incorrect blur effect.
SCPS-56013:
name: "This is Football 2003"
region: "NTSC-K"
SCPS-56014:
name: "Gungrave"
region: "NTSC-K"
@ -11654,6 +11664,8 @@ SLES-51298:
SLES-51301:
name: "SOS - The Final Escape"
region: "PAL-M3"
gsHWFixes:
autoFlush: 1 # Fixes incorrect blur effect.
SLES-51302:
name: "Bomberman Kart"
region: "PAL-M3"
@ -17309,6 +17321,8 @@ SLES-53870:
name: "Devil Kings"
region: "PAL-M5"
compat: 5
gsHWFixes:
halfPixelOffset: 2 # Fixes misaligned bloom.
SLES-53871:
name: "Tengai"
region: "PAL-E"
@ -21661,6 +21675,9 @@ SLKA-15011:
SLKA-15013:
name: "Grand Slam 2003 Tennis" # Hard Hitter 2
region: "NTSC-K"
SLKA-15016:
name: "Harry Potter - Quidditch World Cup"
region: "NTSC-K"
SLKA-15018:
name: "Kidou Senshi Gundam Seed"
region: "NTSC-K"
@ -21674,6 +21691,9 @@ SLKA-15021:
compat: 5
gameFixes:
- OPHFlagHack
SLKA-15023:
name: "Assault Suits Valken"
region: "NTSC-K"
SLKA-15028:
name: "Simple 2000 Series Ultimate Vol. 6 - Love - Upper!"
region: "NTSC-K"
@ -21690,6 +21710,9 @@ SLKA-15032:
SLKA-15033:
name: "Princess Maker 2"
region: "NTSC-K"
SLKA-15043:
name: "Super Puzzle Bobble Collection Vol 1"
region: "NTSC-K"
SLKA-15044:
name: "Super Puzzle Bobble 2"
region: "NTSC-K"
@ -21916,6 +21939,11 @@ SLKA-25084:
SLKA-25085:
name: "Shin Sangoku Musou 3 - Mushouden"
region: "NTSC-K"
SLKA-25086:
name: "NBA Live 2004"
region: "NTSC-K"
clampModes:
vuClampMode: 2 # Missing geometry with microVU.
SLKA-25087:
name: "FIFA Soccer 2004"
region: "NTSC-J"
@ -21965,6 +21993,9 @@ SLKA-25108:
SLKA-25109:
name: "Shirachuu Tankenbu"
region: "NTSC-K"
SLKA-25110:
name: "NBA Live 2005"
region: "NTSC-K"
SLKA-25111:
name: "King of Fighters 2001, The"
region: "NTSC-K"
@ -22378,9 +22409,17 @@ SLKA-25268:
SLKA-25270:
name: "Armored Core - Formula Front"
region: "NTSC-K"
SLKA-25274:
name: "Princess Maker 4"
region: "NTSC-K"
SLKA-25275:
name: "King of Fighters 2002-2003, The"
region: "NTSC-K"
SLKA-25277:
name: "Brothers In Arms - Road to Hill 30"
region: "NTSC-K"
gsHWFixes:
halfPixelOffset: 2 # Reduces blurriness, there are still ghosting issues for like lighting poles.
SLKA-25279:
name: "Hello Kitty - Rescue Mission"
region: "NTSC-K"
@ -22506,6 +22545,11 @@ SLKA-25323:
SLKA-25325:
name: "SSX On Tour"
region: "NTSC-K"
SLKA-25327:
name: "Harry Potter and the Goblet of Fire"
region: "NTSC-K"
gsHWFixes:
mipmap: 1
SLKA-25328:
name: "Castlevania - Curse of Darkness"
region: "NTSC-K"
@ -25511,6 +25555,9 @@ SLPM-64502:
SLPM-64504:
name: "Maximo"
region: "NTSC-K"
SLPM-64507:
name: "Wave Rally"
region: "NTSC-K"
SLPM-64509:
name: "Crash Bandicoot - Return of the Demon King [English Dub Edition]" # Wrath of Cortex
region: "NTSC-K"
@ -32447,6 +32494,13 @@ SLPM-67513:
SLPM-67514:
name: "Kessen"
region: "NTSC-K"
SLPM-67515:
name: "Metal Gear Solid 2 - Sons of Liberty"
region: "NTSC-K"
gameFixes:
- DMABusyHack # Fixes broken half-bottom artifacts
gsHWFixes:
texturePreloading: 1 # Fixes micro stuttering.
SLPM-67518:
name: "Onimusha 2 Samurai's Destiny"
region: "NTSC-K"
@ -34609,6 +34663,8 @@ SLPS-25113:
name: "Zettai Zetsumei Toshi"
region: "NTSC-J"
compat: 5
gsHWFixes:
autoFlush: 1 # Fixes incorrect blur effect.
SLPS-25114:
name: "G-Breaker - Daisanshi Cloudia Taisen"
region: "NTSC-J"
@ -37205,6 +37261,8 @@ SLPS-25854:
region: "NTSC-J"
clampModes:
eeClampMode: 0 # In-game background visible.
gsHWFixes:
halfPixelOffset: 2 # Fixes blurriness when upscaling.
SLPS-25855:
name: "Battle of Sunrise"
region: "NTSC-J"
@ -37606,6 +37664,8 @@ SLPS-73203:
SLPS-73204:
name: "Zettai Zetsumi Toshi [PlayStation 2 The Best]"
region: "NTSC-J"
gsHWFixes:
autoFlush: 1 # Fixes incorrect blur effect.
SLPS-73205:
name: "Ace Combat 04 - Shattered Skies [PlayStation 2 The Best]"
region: "NTSC-J"
@ -40387,6 +40447,8 @@ SLUS-20561:
name: "Disaster Report"
region: "NTSC-U"
compat: 5
gsHWFixes:
autoFlush: 1 # Fixes incorrect blur effect.
SLUS-20562:
name: "dot hack - Mutation Part 2"
region: "NTSC-U"
@ -43975,6 +44037,8 @@ SLUS-21297:
name: "Devil Kings"
region: "NTSC-U"
compat: 5
gsHWFixes:
halfPixelOffset: 2 # Fixes misaligned bloom.
SLUS-21298:
name: "NCAA March Madness '06"
region: "NTSC-U"
@ -46240,6 +46304,8 @@ SLUS-21779:
compat: 5
clampModes:
eeClampMode: 0 # In-game background visible.
gsHWFixes:
halfPixelOffset: 2 # Fixes blurriness when upscaling.
SLUS-21780:
name: "Ferrari Challenge"
region: "NTSC-U"
@ -47001,6 +47067,8 @@ SLUS-28023:
SLUS-28025:
name: "Disaster Report [Trade Demo]"
region: "NTSC-U"
gsHWFixes:
autoFlush: 1 # Fixes incorrect blur effect.
SLUS-28026:
name: "Everquest Online Adventures [Beta Vol.3.0]"
region: "NTSC-U"

View File

@ -973,8 +973,8 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
03000000021000000090000011010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
03000000c82d00000090000011010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
05000000c82d00001038000000010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
03000000c82d00001151000011010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
05000000c82d00001151000000010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
03000000c82d00001151000011010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
05000000c82d00001151000000010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
03000000c82d00000151000000010000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
03000000c82d00000650000011010000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,start:b11,x:b3,y:b4,platform:Linux,
05000000c82d00005106000000010000,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,start:b11,x:b3,y:b4,platform:Linux,

View File

@ -350,7 +350,7 @@ void GSDevice11::SetupOM(OMDepthStencilSelector dssel, OMBlendSelector bsel, u8
memset(&bd, 0, sizeof(bd));
if (bsel.blend_enable)
if (bsel.blend_enable && (bsel.wrgba & 0x7))
{
bd.RenderTarget[0].BlendEnable = TRUE;
bd.RenderTarget[0].BlendOp = s_d3d11_blend_ops[bsel.blend_op];

View File

@ -2713,6 +2713,9 @@ void GSRendererHW::EmulateBlending(bool& DATE_PRIMID, bool& DATE_BARRIER, bool&
// For mixed blend, the source blend is done in the shader (so we use CONST_ONE as a factor).
m_conf.blend = {true, GSDevice::CONST_ONE, blend.dst, blend.op, m_conf.ps.blend_c == 2, ALPHA.FIX};
m_conf.ps.blend_mix = 1;
// Elide DSB colour output if not used by dest.
m_conf.ps.no_color1 |= !GSDevice::IsDualSourceBlendFactor(blend.dst);
if (blend_mix1)
{
@ -2726,6 +2729,8 @@ void GSRendererHW::EmulateBlending(bool& DATE_PRIMID, bool& DATE_BARRIER, bool&
// clr_hw 1 will disable alpha clamp, we can reuse the old bits.
m_conf.ps.clr_hw = 1;
//m_conf.ps.blend_mix = 0;
// DSB output will always be used.
m_conf.ps.no_color1 = false;
}
m_conf.ps.blend_a = 0;
@ -2752,9 +2757,6 @@ void GSRendererHW::EmulateBlending(bool& DATE_PRIMID, bool& DATE_BARRIER, bool&
// Swap Ad with As for hw blend
m_conf.ps.clr_hw = 6;
}
// Elide DSB colour output if not used by dest.
m_conf.ps.no_color1 |= !GSDevice::IsDualSourceBlendFactor(blend.dst);
}
else
{