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

GS:HW: Properly handle fbmask of negative values 

Previously was possible with blending and colclip, but now more common with the new hdr algorithm
This commit is contained in:
TellowKrinkle 2022-10-08 21:27:49 -05:00 committed by refractionpcsx2
parent af1888b21a
commit 0637682eb0
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/resources/shaders/dx11/tfx.fx
View File

@ -715,7 +715,7 @@ void ps_fbmask(inout float4 C, float2 pos_xy)
if (PS_FBMASK)
{
float4 RT = trunc(RtTexture.Load(int3(pos_xy, 0)) * 255.0f + 0.1f);
C = (float4)(((uint4)C & ~FbMask) | ((uint4)RT & FbMask));
C = (float4)(((uint4)(int4)C & (FbMask ^ 0xFF) | ((uint4)RT & FbMask));
}
}

2
bin/resources/shaders/opengl/tfx_fs.glsl
View File

@ -620,7 +620,7 @@ void ps_fbmask(inout vec4 C)
// FIXME do I need special case for 16 bits
#if PS_FBMASK
vec4 RT = trunc(fetch_rt() * 255.0f + 0.1f);
C = vec4((uvec4(C) & ~FbMask) | (uvec4(RT) & FbMask));
C = vec4((uvec4(ivec4(C)) & (FbMask ^ 0xFFu)) | (uvec4(RT) & FbMask));
#endif
}

2
bin/resources/shaders/vulkan/tfx.glsl
View File

@ -946,7 +946,7 @@ void ps_fbmask(inout vec4 C)
{
#if PS_FBMASK
vec4 RT = trunc(sample_from_rt() * 255.0f + 0.1f);
C = vec4((uvec4(C) & ~FbMask) | (uvec4(RT) & FbMask));
C = vec4((uvec4(ivec4(C)) & (FbMask ^ 0xFFu)) | (uvec4(RT) & FbMask));
#endif
}

2
pcsx2/GS/Renderers/Metal/tfx.metal
View File

@ -767,7 +767,7 @@ struct PSMain
void ps_fbmask(thread float4& C)
{
if (PS_FBMASK)
C = float4((uint4(C) & ~cb.fbmask) | (uint4(current_color * 255.5) & cb.fbmask));
C = float4((uint4(int4(C)) & (cb.fbmask ^ 0xff)) | (uint4(current_color * 255.5) & cb.fbmask));
}
void ps_dither(thread float4& C)