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

GS-d3d: Check each channel individually if it overflows and do corrections.

This commit is contained in:
lightningterror 2023-02-21 17:49:46 +01:00
parent 2eb11ded52
commit 7f7950cd6b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -763,8 +763,10 @@ void ps_color_clamp_wrap(inout float3 C)
} }
} }
void ps_blend(inout float4 Color, inout float As, float2 pos_xy) void ps_blend(inout float4 Color, inout float4 As_rgba, float2 pos_xy)
{ {
float As = As_rgba.a;
if (SW_BLEND) if (SW_BLEND)
{ {
// PABE // PABE
@ -813,15 +815,14 @@ void ps_blend(inout float4 Color, inout float As, float2 pos_xy)
{ {
// Replace Af with As so we can do proper compensation for Alpha. // Replace Af with As so we can do proper compensation for Alpha.
if (PS_BLEND_C == 2) if (PS_BLEND_C == 2)
As = Af; As_rgba = (float4)Af;
// Subtract 1 for alpha to compensate for the changed equation, // Subtract 1 for alpha to compensate for the changed equation,
// if c.rgb > 255.0f then we further need to adjust alpha accordingly, // if c.rgb > 255.0f then we further need to adjust alpha accordingly,
// we pick the lowest overflow from all colors because it's the safest, // we pick the lowest overflow from all colors because it's the safest,
// we divide by 255 the color because we don't know Cd value, // we divide by 255 the color because we don't know Cd value,
// changed alpha should only be done for hw blend. // changed alpha should only be done for hw blend.
float min_color = min(min(Color.r, Color.g), Color.b); float3 alpha_compensate = max((float3)1.0f, Color.rgb / (float3)255.0f);
float alpha_compensate = max(1.0f, min_color / 255.0f); As_rgba.rgb -= alpha_compensate;
As -= alpha_compensate;
} }
else if (PS_CLR_HW == 2) else if (PS_CLR_HW == 2)
{ {
@ -920,15 +921,15 @@ PS_OUTPUT ps_main(PS_INPUT input)
C.a = 128.0f; C.a = 128.0f;
} }
float alpha_blend; float4 alpha_blend;
if (PS_BLEND_C == 1 && PS_CLR_HW > 3) if (PS_BLEND_C == 1 && PS_CLR_HW > 3)
{ {
float4 RT = trunc(RtTexture.Load(int3(input.p.xy, 0)) * 255.0f + 0.1f); float4 RT = trunc(RtTexture.Load(int3(input.p.xy, 0)) * 255.0f + 0.1f);
alpha_blend = RT.a / 128.0f; alpha_blend = (float4)(RT.a / 128.0f);
} }
else else
{ {
alpha_blend = C.a / 128.0f; alpha_blend = (float4)(C.a / 128.0f);
} }
// Alpha correction // Alpha correction
@ -978,12 +979,12 @@ PS_OUTPUT ps_main(PS_INPUT input)
#if !PS_NO_COLOR #if !PS_NO_COLOR
output.c0 = PS_HDR ? float4(C.rgb / 65535.0f, C.a / 255.0f) : C / 255.0f; output.c0 = PS_HDR ? float4(C.rgb / 65535.0f, C.a / 255.0f) : C / 255.0f;
#if !PS_NO_COLOR1 #if !PS_NO_COLOR1
output.c1 = (float4)(alpha_blend); output.c1 = alpha_blend;
#endif #endif
#if PS_NO_ABLEND #if PS_NO_ABLEND
// write alpha blend factor into col0 // write alpha blend factor into col0
output.c0.a = alpha_blend; output.c0.a = alpha_blend.a;
#endif #endif
#if PS_ONLY_ALPHA #if PS_ONLY_ALPHA
// rgb isn't used // rgb isn't used