history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-04-28 15:15:43 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

GPU: Fix mask bit setting on non-textured polygons

Browse Source 
Fixes garbled colours in FMVs in some games.
This commit is contained in:
Connor McLaughlin 2019-12-10 23:27:39 +10:00
parent 0d293c4be4
commit 152b56c8cc
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/gpu_hw_shadergen.cpp
View File

@ -512,6 +512,7 @@ float4 SampleFromVRAM(int4 texpage, int2 icoord)
bool semitransparent; bool semitransparent;
int3 icolor; int3 icolor;
float ialpha; float ialpha;
float oalpha;
#if TEXTURED #if TEXTURED
#if TEXTURE_FILTERING #if TEXTURE_FILTERING
@ -554,11 +555,17 @@ float4 SampleFromVRAM(int4 texpage, int2 icoord)
#else #else
icolor = (vertcol * int3(texcol.rgb * float3(255.0, 255.0, 255.0))) >> 7; icolor = (vertcol * int3(texcol.rgb * float3(255.0, 255.0, 255.0))) >> 7;
#endif #endif
// Compute output alpha (mask bit)
oalpha = float(u_set_mask_while_drawing ? 1 : int(semitransparent));
#else #else
// All pixels are semitransparent for untextured polygons. // All pixels are semitransparent for untextured polygons.
semitransparent = true; semitransparent = true;
icolor = vertcol; icolor = vertcol;
ialpha = 1.0; ialpha = 1.0;
// However, the mask bit is cleared if set mask bit is false.
oalpha = float(u_set_mask_while_drawing);
#endif #endif
// Apply dithering // Apply dithering
@ -571,9 +578,6 @@ float4 SampleFromVRAM(int4 texpage, int2 icoord)
icolor = TruncateTo15Bit(icolor); icolor = TruncateTo15Bit(icolor);
#endif #endif
// Compute output alpha (mask bit)
float output_alpha = float(u_set_mask_while_drawing ? 1 : int(semitransparent));
// Normalize // Normalize
float3 color = float3(icolor) / float3(255.0, 255.0, 255.0); float3 color = float3(icolor) / float3(255.0, 255.0, 255.0);
@ -586,7 +590,7 @@ float4 SampleFromVRAM(int4 texpage, int2 icoord)
#endif #endif
#if USE_DUAL_SOURCE #if USE_DUAL_SOURCE
o_col0 = float4(color * (u_src_alpha_factor * ialpha), output_alpha); o_col0 = float4(color * (u_src_alpha_factor * ialpha), oalpha);
o_col1 = float4(0.0, 0.0, 0.0, u_dst_alpha_factor / ialpha); o_col1 = float4(0.0, 0.0, 0.0, u_dst_alpha_factor / ialpha);
#else #else
o_col0 = float4(color * (u_src_alpha_factor * ialpha), u_dst_alpha_factor / ialpha); o_col0 = float4(color * (u_src_alpha_factor * ialpha), u_dst_alpha_factor / ialpha);
@ -599,7 +603,7 @@ float4 SampleFromVRAM(int4 texpage, int2 icoord)
#endif #endif
#if USE_DUAL_SOURCE #if USE_DUAL_SOURCE
o_col0 = float4(color * ialpha, output_alpha); o_col0 = float4(color * ialpha, oalpha);
o_col1 = float4(0.0, 0.0, 0.0, 0.0); o_col1 = float4(0.0, 0.0, 0.0, 0.0);
#else #else
o_col0 = float4(color * ialpha, 1.0 - ialpha); o_col0 = float4(color * ialpha, 1.0 - ialpha);
@ -607,7 +611,7 @@ float4 SampleFromVRAM(int4 texpage, int2 icoord)
} }
#else #else
// Non-transparency won't enable blending so we can write the mask here regardless. // Non-transparency won't enable blending so we can write the mask here regardless.
o_col0 = float4(color * ialpha, output_alpha); o_col0 = float4(color * ialpha, oalpha);
#if USE_DUAL_SOURCE #if USE_DUAL_SOURCE
o_col1 = float4(0.0, 0.0, 0.0, 1.0 - ialpha); o_col1 = float4(0.0, 0.0, 0.0, 1.0 - ialpha);