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

gsdx-hw: Forgot to remove a crc region check for dbzbt2-3, no longer needed.

This commit is contained in:
lightningterror 2019-04-25 16:34:28 +02:00
parent 8eab618502
commit a0c6c1cb9f
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/GSdx/Renderers/HW/GSHwHack.cpp
View File

@ -74,16 +74,15 @@ bool GSC_Bully(const GSFrameInfo& fi, int& skip)
return true; return true;
} }
// Potentially partially dx only
bool GSC_DBZBT2(const GSFrameInfo& fi, int& skip) bool GSC_DBZBT2(const GSFrameInfo& fi, int& skip)
{ {
if(skip == 0) if(skip == 0)
{ {
if((g_crc_region == CRC::EU || Aggressive || !s_nativeres) && !fi.TME && (fi.FBP == 0x02a00 || fi.FBP == 0x03000) && fi.FPSM == PSM_PSMCT16) if((Aggressive || !s_nativeres) && !fi.TME && (fi.FBP == 0x02a00 || fi.FBP == 0x03000) && fi.FPSM == PSM_PSMCT16)
{ {
// Character outlines. // Character outlines.
// Glow/blur effect. Causes ghosting on upscaled resolution. // Glow/blur effect. Causes ghosting on upscaled resolution.
// Don't enable hack on native res if crc(ntsc only) is below aggressive. // Don't enable hack on native res if crc is below aggressive.
skip = 10; skip = 10;
} }
} }
@ -91,16 +90,15 @@ bool GSC_DBZBT2(const GSFrameInfo& fi, int& skip)
return true; return true;
} }
// Potentially partially dx only
bool GSC_DBZBT3(const GSFrameInfo& fi, int& skip) bool GSC_DBZBT3(const GSFrameInfo& fi, int& skip)
{ {
if(skip == 0) if(skip == 0)
{ {
if((g_crc_region == CRC::EU || Aggressive || !s_nativeres) && fi.TME && (fi.FBP == 0x03400 || fi.FBP == 0x02e00) && fi.FPSM == fi.TPSM && fi.TBP0 == 0x03f00 && fi.TPSM == PSM_PSMCT32) if((Aggressive || !s_nativeres) && fi.TME && (fi.FBP == 0x03400 || fi.FBP == 0x02e00) && fi.FPSM == fi.TPSM && fi.TBP0 == 0x03f00 && fi.TPSM == PSM_PSMCT32)
{ {
// Ghosting/Blur effect. Upscaling issue. // Ghosting/Blur effect. Upscaling issue.
// Can be fixed with TC X,Y offsets. // Can be fixed with TC X,Y offsets.
// Don't enable hack on native res if crc(ntsc only) is below aggressive. // Don't enable hack on native res if crc is below aggressive.
skip = 3; skip = 3;
} }
} }
@ -159,13 +157,13 @@ bool GSC_DemonStone(const GSFrameInfo& fi, int& skip)
return true; return true;
} }
// Channel effect not properly supported yet
bool GSC_GiTS(const GSFrameInfo& fi, int& skip) bool GSC_GiTS(const GSFrameInfo& fi, int& skip)
{ {
if(skip == 0) if(skip == 0)
{ {
if(fi.TME && fi.FBP == 0x03000 && fi.FPSM == PSM_PSMCT32 && fi.TPSM == PSM_PSMT8) if(fi.TME && fi.FBP == 0x03000 && fi.FPSM == PSM_PSMCT32 && fi.TPSM == PSM_PSMT8)
{ {
// Channel effect not properly supported yet
skip = 9; skip = 9;
} }
} }

2
plugins/GSdx/Renderers/OpenGL/GSRendererOGL.cpp
View File

@ -905,7 +905,7 @@ GSRendererOGL::PRIM_OVERLAP GSRendererOGL::PrimitiveOverlap()
} }
#endif #endif
//fprintf(stderr, "%d: Yes, code can be optimized (draw of %d vertices)\n", s_n, count); fprintf(stderr, "%d: Yes, code can be optimized (draw of %d vertices)\n", s_n, count);
return overlap; return overlap;
} }

4
plugins/GSdx/res/tfx.fx
View File

@ -81,7 +81,7 @@ struct PS_OUTPUT
Texture2D<float4> Texture : register(t0); Texture2D<float4> Texture : register(t0);
Texture2D<float4> Palette : register(t1); Texture2D<float4> Palette : register(t1);
Texture2D<float4> RtSample : register(t3); Texture2D<float4> RtSampler : register(t3);
Texture2D<float4> RawTexture : register(t4); Texture2D<float4> RawTexture : register(t4);
SamplerState TextureSampler : register(s0); SamplerState TextureSampler : register(s0);
SamplerState PaletteSampler : register(s1); SamplerState PaletteSampler : register(s1);
@ -920,7 +920,7 @@ PS_OUTPUT ps_main(PS_INPUT input)
if (PS_FBMASK) if (PS_FBMASK)
{ {
float4 rt = RtSample.Load(int3(input.p.xy, 0)); float4 rt = RtSampler.Load(int3(input.p.xy, 0));
uint4 denorm_rt = uint4(rt * 255.0f + 0.5f); uint4 denorm_rt = uint4(rt * 255.0f + 0.5f);
uint4 denorm_c = uint4(c * 255.0f + 0.5f); uint4 denorm_c = uint4(c * 255.0f + 0.5f);
c = float4((denorm_c & ~FbMask) | (denorm_rt & FbMask)) / 255.0f; c = float4((denorm_c & ~FbMask) | (denorm_rt & FbMask)) / 255.0f;