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

GS: Improved MAD compatibility with other graphics settings

This commit is contained in:
sideprojectslab 2022-11-12 23:59:49 +01:00 committed by refractionpcsx2
parent 50861dc5c1
commit 21fa2ee87b
9 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/resources/shaders/dx11/interlace.fx
View File

@ -58,7 +58,7 @@ float4 ps_main4(PS_INPUT input) : SV_Target0
const int idx = int(ZrH.x); // buffer index passed from CPU
const int bank = idx >> 1; // current bank
const int field = idx & 1; // current field
const int vres = int(ZrH.z); // vertical resolution of source texture
const int vres = int(ZrH.z) >> 1; // vertical resolution of source texture
const int lofs = ((((vres + 1) >> 1) << 1) - vres) & bank; // line alignment offset for bank 1
const int vpos = int(input.p.y) + lofs; // vertical position of destination texture
const float2 bofs = float2(0.0f, 0.5f * bank); // vertical offset of the current bank relative to source texture size
@ -68,7 +68,7 @@ float4 ps_main4(PS_INPUT input) : SV_Target0
// if the index of current destination line belongs to the current fiels we update it, otherwise
// we leave the old line in the destination buffer
if ((optr.y >= 0.0f) && (optr.y < 0.5f) && ((vpos & 1) == field))
if ((optr.y >= 0.0f) && (optr.y < 0.5f) && ((vpos & 1) != field))
return Texture.Sample(Sampler, iptr);
else
discard;
@ -82,7 +82,7 @@ float4 ps_main5(PS_INPUT input) : SV_Target0
// we use the contents of the MAD frame buffer to reconstruct the missing lines from the current
// field.
const int idx = int(round(ZrH.x)); // buffer index passed from CPU
const int idx = int(ZrH.x); // buffer index passed from CPU
const int bank = idx >> 1; // current bank
const int field = idx & 1; // current field
const int vpos = int(input.p.y); // vertical position of destination texture
@ -90,7 +90,7 @@ float4 ps_main5(PS_INPUT input) : SV_Target0
const float3 motion_thr = float3(1.0, 1.0, 1.0) * sensitivity; //
const float2 bofs = float2(0.0f, 0.5f); // position of the bank 1 relative to source texture size
const float2 vscale = float2(1.0f, 0.5f); // scaling factor from source to destination texture
const float2 lofs = float2(0.0f, ZrH.y); // distance between two adjacent lines relative to source texture size
const float2 lofs = float2(0.0f, ZrH.y) * vscale; // distance between two adjacent lines relative to source texture size
const float2 iptr = input.t * vscale; // pointer to the current pixel in the source texture
float2 p_t0; // pointer to current pixel (missing or not) from most recent frame
@ -159,7 +159,7 @@ float4 ps_main5(PS_INPUT input) : SV_Target0
// selecting deinterlacing output
if ((vpos & 1) == field)
if ((vpos & 1) != field)
{
// output coordinate present on current field
return Texture.Sample(Sampler, p_t0);

10
bin/resources/shaders/opengl/interlace.glsl
View File

@ -61,7 +61,7 @@ void ps_main4()
const int idx = int(ZrH.x); // buffer index passed from CPU
const int bank = idx >> 1; // current bank
const int field = idx & 1; // current field
const int vres = int(ZrH.z); // vertical resolution of source texture
const int vres = int(ZrH.z) >> 1; // vertical resolution of source texture
const int lofs = ((((vres + 1) >> 1) << 1) - vres) & bank; // line alignment offset for bank 1
const int vpos = int(gl_FragCoord.y) + lofs; // vertical position of destination texture
const vec2 bofs = vec2(0.0f, 0.5f * bank); // vertical offset of the current bank relative to source texture size
@ -71,7 +71,7 @@ void ps_main4()
// if the index of current destination line belongs to the current fiels we update it, otherwise
// we leave the old line in the destination buffer
if ((optr.y >= 0.0f) && (optr.y < 0.5f) && ((vpos & 1) == field))
if ((optr.y >= 0.0f) && (optr.y < 0.5f) && ((vpos & 1) != field))
SV_Target0 = texture(TextureSampler, iptr);
else
discard;
@ -83,7 +83,7 @@ void ps_main5()
// we use the contents of the MAD frame buffer to reconstruct the missing lines from the current
// field.
const int idx = int(round(ZrH.x)); // buffer index passed from CPU
const int idx = int(ZrH.x); // buffer index passed from CPU
const int bank = idx >> 1; // current bank
const int field = idx & 1; // current field
const int vpos = int(gl_FragCoord.y); // vertical position of destination texture
@ -91,7 +91,7 @@ void ps_main5()
const vec3 motion_thr = vec3(1.0, 1.0, 1.0) * sensitivity; //
const vec2 bofs = vec2(0.0f, 0.5f); // position of the bank 1 relative to source texture size
const vec2 vscale = vec2(1.0f, 0.5f); // scaling factor from source to destination texture
const vec2 lofs = vec2(0.0f, ZrH.y); // distance between two adjacent lines relative to source texture size
const vec2 lofs = vec2(0.0f, ZrH.y) * vscale; // distance between two adjacent lines relative to source texture size
const vec2 iptr = PSin_t * vscale; // pointer to the current pixel in the source texture
vec2 p_t0; // pointer to current pixel (missing or not) from most recent frame
@ -162,7 +162,7 @@ void ps_main5()
// selecting deinterlacing output
if ((vpos & 1) == field)
if ((vpos & 1) != field)
{
// output coordinate present on current field
SV_Target0 = texture(TextureSampler, p_t0);

12
bin/resources/shaders/vulkan/interlace.glsl
View File

@ -73,10 +73,10 @@ void ps_main4()
// causing the wrong lines to be discarded, so a vertical offset (lofs) is added to the vertical
// position of the destination texture to force the proper field alignment
const int idx = int(round(ZrH.x)); // buffer index passed from CPU
const int idx = int(ZrH.x); // buffer index passed from CPU
const int bank = idx >> 1; // current bank
const int field = idx & 1; // current field
const int vres = int(round(ZrH.z)); // vertical resolution of source texture
const int vres = int(ZrH.z) >> 1; // vertical resolution of source texture
const int lofs = ((((vres + 1) >> 1) << 1) - vres) & bank; // line alignment offset for bank 1
const int vpos = int(gl_FragCoord.y) + lofs; // vertical position of destination texture
const vec2 bofs = vec2(0.0f, 0.5f * bank); // vertical offset of the current bank relative to source texture size
@ -86,7 +86,7 @@ void ps_main4()
// if the index of current destination line belongs to the current fiels we update it, otherwise
// we leave the old line in the destination buffer
if ((optr.y >= 0.0f) && (optr.y < 0.5f) && ((vpos & 1) == field))
if ((optr.y >= 0.0f) && (optr.y < 0.5f) && ((vpos & 1) != field))
o_col0 = texture(samp0, iptr);
else
discard;
@ -100,7 +100,7 @@ void ps_main5()
// we use the contents of the MAD frame buffer to reconstruct the missing lines from the current
// field.
const int idx = int(round(ZrH.x)); // buffer index passed from CPU
const int idx = int(ZrH.x); // buffer index passed from CPU
const int bank = idx >> 1; // current bank
const int field = idx & 1; // current field
const int vpos = int(gl_FragCoord.y); // vertical position of destination texture
@ -108,7 +108,7 @@ void ps_main5()
const vec3 motion_thr = vec3(1.0, 1.0, 1.0) * sensitivity; //
const vec2 bofs = vec2(0.0f, 0.5f); // position of the bank 1 relative to source texture size
const vec2 vscale = vec2(1.0f, 0.5f); // scaling factor from source to destination texture
const vec2 lofs = vec2(0.0f, ZrH.y); // distance between two adjacent lines relative to source texture size
const vec2 lofs = vec2(0.0f, ZrH.y) * vscale; // distance between two adjacent lines relative to source texture size
const vec2 iptr = v_tex * vscale; // pointer to the current pixel in the source texture
vec2 p_t0; // pointer to current pixel (missing or not) from most recent frame
@ -177,7 +177,7 @@ void ps_main5()
// selecting deinterlacing output
if ((vpos & 1) == field) // output coordinate present on current field
if ((vpos & 1) != field) // output coordinate present on current field
{
// output coordinate present on current field
o_col0 = texture(samp0, p_t0);

3
pcsx2/GS/Renderers/DX11/GSDevice11.cpp
View File

@ -825,7 +825,6 @@ void GSDevice11::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
void GSDevice11::DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool linear, float yoffset, int bufIdx)
{
const GSVector4 ss = GSVector4(sTex->GetSize());
const GSVector4 ds = GSVector4(dTex->GetSize());
const GSVector4 sRect(0, 0, 1, 1);
@ -833,7 +832,7 @@ void GSDevice11::DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool
InterlaceConstantBuffer cb;
cb.ZrH = GSVector4(static_cast<float>(bufIdx), 1.0f / ss.y, ss.y, MAD_SENSITIVITY);
cb.ZrH = GSVector4(static_cast<float>(bufIdx), 1.0f / ds.y, ds.y, MAD_SENSITIVITY);
m_ctx->UpdateSubresource(m_interlace.cb.get(), 0, nullptr, &cb, 0, 0);

3
pcsx2/GS/Renderers/DX12/GSDevice12.cpp
View File

@ -722,7 +722,6 @@ void GSDevice12::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
void GSDevice12::DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool linear, float yoffset, int bufIdx)
{
const GSVector4 ss = GSVector4(sTex->GetSize());
const GSVector2i ds_i = dTex->GetSize();
const GSVector4 ds = GSVector4(ds_i);
@ -732,7 +731,7 @@ void GSDevice12::DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool
InterlaceConstantBuffer cb;
cb.ZrH = GSVector4(static_cast<float>(bufIdx), 1.0f / ss.y, ss.y, MAD_SENSITIVITY);
cb.ZrH = GSVector4(static_cast<float>(bufIdx), 1.0f / ds.y, ds.y, MAD_SENSITIVITY);
GL_PUSH("DoInterlace %dx%d Shader:%d Linear:%d", ds_i.x, ds_i.y, shader, linear);

3
pcsx2/GS/Renderers/Metal/GSDeviceMTL.mm
View File

@ -588,14 +588,13 @@ void GSDeviceMTL::DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool
id<MTLCommandBuffer> cmdbuf = GetRenderCmdBuf();
GSScopedDebugGroupMTL dbg(cmdbuf, @"DoInterlace");
GSVector4 ss = GSVector4(sTex->GetSize());
GSVector4 ds = GSVector4(dTex->GetSize());
GSVector4 sRect(0, 0, 1, 1);
GSVector4 dRect(0.f, yoffset, ds.x, ds.y + yoffset);
GSMTLInterlacePSUniform cb = {};
cb.ZrH = {static_cast<float>(bufIdx), 1.0f / ss.y, ss.y, MAD_SENSITIVITY};
cb.ZrH = {static_cast<float>(bufIdx), 1.0f / ds.y, ds.y, MAD_SENSITIVITY};
DoStretchRect(sTex, sRect, dTex, dRect, m_interlace_pipeline[shader], linear, shader > 1 ? LoadAction::DontCareIfFull : LoadAction::Load, &cb, sizeof(cb));
}}

28
pcsx2/GS/Renderers/Metal/interlace.metal
View File

@ -58,10 +58,10 @@ fragment float4 ps_interlace4(ConvertShaderData data [[stage_in]], ConvertPSRes
// causing the wrong lines to be discarded, so a vertical offset (lofs) is added to the vertical
// position of the destination texture to force the proper field alignment
const int idx = int(round(uniform.ZrH.x)); // buffer index passed from CPU
const int idx = int(uniform.ZrH.x); // buffer index passed from CPU
const int bank = idx >> 1; // current bank
const int field = idx & 1; // current field
const int vres = int(round(uniform.ZrH.z)); // vertical resolution of source texture
const int vres = int(uniform.ZrH.z) >> 1; // vertical resolution of source texture
const int lofs = ((((vres + 1) >> 1) << 1) - vres) & bank; // line alignment offset for bank 1
const int vpos = int(data.p.y) + lofs; // vertical position of destination texture
const float2 bofs = float2(0.0f, 0.5f * bank); // vertical offset of the current bank relative to source texture size
@ -71,7 +71,7 @@ fragment float4 ps_interlace4(ConvertShaderData data [[stage_in]], ConvertPSRes
// if the index of current destination line belongs to the current fiels we update it, otherwise
// we leave the old line in the destination buffer
if ((optr.y >= 0.0f) && (optr.y < 0.5f) && ((vpos & 1) == field))
if ((optr.y >= 0.0f) && (optr.y < 0.5f) && ((vpos & 1) != field))
return res.sample(iptr);
else
discard_fragment();
@ -82,16 +82,16 @@ fragment float4 ps_interlace4(ConvertShaderData data [[stage_in]], ConvertPSRes
fragment float4 ps_interlace5(ConvertShaderData data [[stage_in]], ConvertPSRes res,
constant GSMTLInterlacePSUniform& uniform [[buffer(GSMTLBufferIndexUniforms)]])
{
const int idx = int(round(uniform.ZrH.x)); // buffer index passed from CPU
const int bank = idx >> 1; // current bank
const int field = idx & 1; // current field
const int vpos = int(data.p.y); // vertical position of destination texture
const float sensitivity = uniform.ZrH.w; // passed from CPU, higher values mean more likely to use weave
const float3 motion_thr = float3(1.0, 1.0, 1.0) * sensitivity; //
const float2 bofs = float2(0.0f, 0.5f); // position of the bank 1 relative to source texture size
const float2 vscale = float2(1.0f, 0.5f); // scaling factor from source to destination texture
const float2 lofs = float2(0.0f, uniform.ZrH.y); // distance between two adjacent lines relative to source texture size
const float2 iptr = data.t * vscale; // pointer to the current pixel in the source texture
const int idx = int(uniform.ZrH.x); // buffer index passed from CPU
const int bank = idx >> 1; // current bank
const int field = idx & 1; // current field
const int vpos = int(data.p.y); // vertical position of destination texture
const float sensitivity = uniform.ZrH.w; // passed from CPU, higher values mean more likely to use weave
const float3 motion_thr = float3(1.0, 1.0, 1.0) * sensitivity; //
const float2 bofs = float2(0.0f, 0.5f); // position of the bank 1 relative to source texture size
const float2 vscale = float2(1.0f, 0.5f); // scaling factor from source to destination texture
const float2 lofs = float2(0.0f, uniform.ZrH.y) * vscale; // distance between two adjacent lines relative to source texture size
const float2 iptr = data.t * vscale; // pointer to the current pixel in the source texture
float2 p_t0; // pointer to current pixel (missing or not) from most recent frame
@ -160,7 +160,7 @@ fragment float4 ps_interlace5(ConvertShaderData data [[stage_in]], ConvertPSRes
// selecting deinterlacing output
if ((vpos & 1) == field)
if ((vpos & 1) != field)
{
// output coordinate present on current field
return res.sample(p_t0);

3
pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp
View File

@ -1391,14 +1391,13 @@ void GSDeviceOGL::DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool
OMSetColorMaskState();
const GSVector4 ss = GSVector4(sTex->GetSize());
const GSVector4 ds = GSVector4(dTex->GetSize());
const GSVector4 sRect(0, 0, 1, 1);
const GSVector4 dRect(0.0f, yoffset, ds.x, ds.y + yoffset);
m_interlace.ps[shader].Bind();
m_interlace.ps[shader].Uniform4f(0, bufIdx, 1.0f / ss.y, ss.y, MAD_SENSITIVITY);
m_interlace.ps[shader].Uniform4f(0, bufIdx, 1.0f / ds.y, ds.y, MAD_SENSITIVITY);
StretchRect(sTex, sRect, dTex, dRect, m_interlace.ps[shader], linear);
}

3
pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp
View File

@ -857,7 +857,6 @@ void GSDeviceVK::DoMerge(GSTexture* sTex[3], GSVector4* sRect, GSTexture* dTex,
void GSDeviceVK::DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool linear, float yoffset, int bufIdx)
{
const GSVector4 ss = GSVector4(sTex->GetSize());
const GSVector2i ds_i = dTex->GetSize();
const GSVector4 ds = GSVector4(ds_i);
@ -867,7 +866,7 @@ void GSDeviceVK::DoInterlace(GSTexture* sTex, GSTexture* dTex, int shader, bool
InterlaceConstantBuffer cb;
cb.ZrH = GSVector4(static_cast<float>(bufIdx), 1.0f / ss.y, ss.y, MAD_SENSITIVITY);
cb.ZrH = GSVector4(static_cast<float>(bufIdx), 1.0f / ds.y, ds.y, MAD_SENSITIVITY);
GL_PUSH("DoInterlace %dx%d Shader:%d Linear:%d", ds_i.x, ds_i.y, shader, linear);