PCSX2/pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2026-10-11 22:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

GS:HW: Do ROV channel masking with FBMask.

Browse Source
This commit is contained in:
TJnotJT
2026-09-04 11:39:30 +02:00
committed by lightningterror
parent ca5942151a
commit 77cfac7dbe
6 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/resources/shaders/dx11/tfx.fx
+5 -3
View File
@@ -1097,8 +1097,11 @@ void ps_fbmask(inout float4 C, float2 pos_xy)
{
if (PS_FBMASK)
{
float multi = PS_COLCLIP_HW ? 65535.0f : 255.0f;
float4 RT = trunc(RtLoad(int2(pos_xy)) * multi + 0.1f);
float multi_rgb = PS_COLCLIP_HW ? 65535.0f : 255.0f;
float multi_a = PS_RTA_CORRECTION ? 128.0f : 255.0f;
float4 RT = RtLoad(int2(pos_xy));
RT.rgb = trunc(RT.rgb * multi_rgb + 0.1f);
RT.a = round(RT.a * multi_a);
C = (float4)(((uint4)C & ~FbMask) | ((uint4)RT & FbMask));
}
}
@@ -1594,7 +1597,6 @@ if (bad)
output.c1 = o_col1;
#endif
#elif PS_RETURN_COLOR_ROV
o_col0 = (FbMask == 0xFFu) ? RtLoad(input.p.xy) : o_col0; // channel masking
if (!rov_discard_color)
RtWrite(input.p.xy, o_col0);
#endif
bin/resources/shaders/opengl/tfx_fs.glsl
+5 -5
View File
@@ -932,11 +932,11 @@ void ps_fbmask(inout vec4 C)
{
// FIXME do I need special case for 16 bits
#if PS_FBMASK
#if PS_COLCLIP_HW == 1
vec4 RT = trunc(sample_from_rt() * 65535.0f);
#else
vec4 RT = trunc(sample_from_rt() * 255.0f + 0.1f);
#endif
float multi_rgb = PS_COLCLIP_HW != 0 ? 65535.0f : 255.0f;
float multi_a = PS_RTA_CORRECTION != 0 ? 128.0f : 255.0f;
vec4 RT = sample_from_rt();
RT.rgb = trunc(RT.rgb * multi_rgb + 0.1f);
RT.a = round(RT.a * multi_a);
C = vec4((uvec4(C) & ~FbMask) | (uvec4(RT) & FbMask));
#endif
}
bin/resources/shaders/vulkan/tfx.glsl
+5 -7
View File
@@ -1448,11 +1448,11 @@ vec4 ps_color()
void ps_fbmask(inout vec4 C)
{
#if PS_FBMASK
#if PS_COLCLIP_HW == 1
vec4 RT = trunc(sample_from_rt() * 65535.0f);
#else
vec4 RT = trunc(sample_from_rt() * 255.0f + 0.1f);
#endif
float multi_rgb = PS_COLCLIP_HW != 0 ? 65535.0f : 255.0f;
float multi_a = PS_RTA_CORRECTION != 0 ? 128.0f : 255.0f;
vec4 RT = sample_from_rt();
RT.rgb = trunc(RT.rgb * multi_rgb + 0.1f);
RT.a = round(RT.a * multi_a);
C = vec4((uvec4(C) & ~FbMask) | (uvec4(RT) & FbMask));
#endif
}
@@ -1966,8 +1966,6 @@ void main()
// Writing back color (result already written to o_col0 for non-ROV)
#if PS_RETURN_COLOR_ROV
o_col0 = mix(o_col0, sample_from_rt(), equal(FbMask, uvec4(0xFFu))); // channel masking
if (!rov_discard_color)
imageStore(RtImageRov, ivec2(gl_FragCoord.xy), o_col0);
#endif
pcsx2/GS/Renderers/HW/GSRendererHW.cpp
+5 -14
View File
@@ -7689,26 +7689,17 @@ void GSRendererHW::ConfigureROV(bool color_rov, bool depth_rov)
if (color_rov)
{
// FbMask setup
if (m_conf.colormask.wrgba != 0)
if (m_conf.colormask.wrgba != 0 && m_conf.colormask.wrgba != 0xF)
{
if (!m_conf.ps.fbmask)
m_conf.cb_ps.FbMask = GSVector4i::zero();
const GSVector4i fbmask = GSVector4i(m_conf.colormask.wr ? 0 : 0xFF, m_conf.colormask.wg ? 0 : 0xFF,
m_conf.colormask.wb ? 0 : 0xFF, m_conf.colormask.wa ? 0 : 0xFF);
if (!m_conf.ps.fbmask)
{
// Don't enable FB mask emulation, just use the mask for ROV.
m_conf.cb_ps.FbMask = fbmask;
}
else
{
m_conf.cb_ps.FbMask |= fbmask;
}
m_conf.ps.fbmask = true;
m_conf.cb_ps.FbMask |= fbmask;
GL_INS("ROV: FbMask={R=%x, G=%x, B=%x, A=%x}",
m_conf.cb_ps.FbMask.r, m_conf.cb_ps.FbMask.g, m_conf.cb_ps.FbMask.b, m_conf.cb_ps.FbMask.a);
}
else
{
m_conf.ps.no_color = true;
}
// Blend setup
if (m_conf.IsBlending())
pcsx2/GS/Renderers/Metal/tfx.metal
+7 -5
View File
@@ -1304,8 +1304,12 @@ struct PSMain
{
if (PS_FBMASK)
{
float multi = PS_COLCLIP_HW ? 65535.0 : 255.5;
C = float4((uint4(int4(C)) & (cb.fbmask ^ 0xff)) | (uint4(current_color * float4(multi, multi, multi, 255)) & cb.fbmask));
float multi_rgb = PS_COLCLIP_HW ? 65535.0 : 255.5;
float multi_a = PS_RTA_CORRECTION ? 128.0 : 255.0;
float4 RT = current_color;
RT.rgb = RT.rgb * multi_rgb;
RT.a = round(RT.a * multi_a);
C = float4((uint4(int4(C)) & (cb.fbmask ^ 0xff)) | (uint4(RT) & cb.fbmask));
}
}
@@ -1769,7 +1773,7 @@ fragment MainPSOut ps_main(
main.current_depth = ds_tex.read(coord).x;
}
if (NEEDS_RT || (PS_ROV_COLOR && any(cb.fbmask == 0xff)))
if (NEEDS_RT)
{
if (PS_ROV_COLOR)
{
@@ -1797,8 +1801,6 @@ fragment MainPSOut ps_main(
ds_rov.write(out.depth, coord);
if (PS_ROV_COLOR && !main.color_discarded)
{
if (!PS_FBMASK)
out.c0 = select(out.c0, main.current_color, cb.fbmask == 0xff);
if (ROV_NEEDS_R32)
rt_u32.write(pack_float_to_unorm4x8(out.c0), coord);
else
pcsx2/ShaderCacheVersion.h
+1 -1
View File
@@ -3,4 +3,4 @@
/// Version number for GS and other shaders. Increment whenever any of the contents of the
/// shaders change, to invalidate the cache.
static constexpr u32 SHADER_CACHE_VERSION = 112; // Last changed in PR 14824 (2)
static constexpr u32 SHADER_CACHE_VERSION = 113; // Last changed in PR 14743