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

gsdx-hw: Cleanup a bit EmulateZbuffer. 

Update the comment to reflect recent changes,

Rename DepthMask to MaxDepth,

use a mask shift to get z format,

Do vs cb padding on d3d11.
This commit is contained in:
lightningterror 2020-05-23 20:37:51 +02:00
parent 845a3d0ab8
commit 5d0eefeebd
7 changed files with 31 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/GSdx/Renderers/DX11/GSDevice11.h
View File

@ -41,15 +41,16 @@ public:
GSVector4 VertexScale;
GSVector4 VertexOffset;
GSVector4 Texture_Scale_Offset;
GSVector2i DepthMask;
GSVector2i MaxDepth;
GSVector2i pad_vscb;
VSConstantBuffer()
{
VertexScale = GSVector4::zero();
VertexOffset = GSVector4::zero();
Texture_Scale_Offset = GSVector4::zero();
DepthMask = GSVector2i(0);
MaxDepth = GSVector2i(0);
pad_vscb = GSVector2i(0);
}
__forceinline bool Update(const VSConstantBuffer* cb)

24
plugins/GSdx/Renderers/DX11/GSRendererDX11.cpp
View File

@ -159,24 +159,16 @@ void GSRendererDX11::EmulateZbuffer()
m_om_dssel.ztst = ZTST_ALWAYS;
}
uint32 max_z;
if (m_context->ZBUF.PSM == PSM_PSMZ32)
// On the real GS we appear to do clamping on the max z value the format allows.
// Clamping is done after rasterization.
const uint32 max_z = 0xFFFFFFFF >> (GSLocalMemory::m_psm[m_context->ZBUF.PSM].fmt * 8);
const bool clamp_z = (uint32)(GSVector4i(m_vt.m_max.p).z) > max_z;
vs_cb.MaxDepth = GSVector2i(0xFFFFFFFF);
if (clamp_z)
{
max_z = 0xFFFFFFFF;
// FIXME: Do z clamping for sprites on vs, triangles on ps.
vs_cb.MaxDepth = GSVector2i(max_z);
}
else if (m_context->ZBUF.PSM == PSM_PSMZ24)
{
max_z = 0xFFFFFF;
}
else
{
max_z = 0xFFFF;
}
// The real GS appears to do no masking based on the Z buffer format and writing larger Z values
// than the buffer supports seems to be an error condition on the real GS, causing it to crash.
// We are probably receiving bad coordinates from VU1 in these cases.
vs_cb.DepthMask = GSVector2i(max_z, max_z);
GSVertex* v = &m_vertex.buff[0];
// Minor optimization of a corner case (it allow to better emulate some alpha test effects)

4
plugins/GSdx/Renderers/OpenGL/GSDeviceOGL.h
View File

@ -117,15 +117,15 @@ public:
GSVector4 TextureOffset;
GSVector2i DepthMask;
GSVector2 PointSize;
GSVector2i MaxDepth;
VSConstantBuffer()
{
Vertex_Scale_Offset = GSVector4::zero();
TextureOffset = GSVector4::zero();
DepthMask = GSVector2i(0);
PointSize = GSVector2(0);
MaxDepth = GSVector2i(0);
}
__forceinline bool Update(const VSConstantBuffer* cb)

21
plugins/GSdx/Renderers/OpenGL/GSRendererOGL.cpp
View File

@ -171,20 +171,17 @@ void GSRendererOGL::EmulateZbuffer()
m_om_dssel.ztst = ZTST_ALWAYS;
}
uint32 max_z;
if (m_context->ZBUF.PSM == PSM_PSMZ32) {
max_z = 0xFFFFFFFF;
} else if (m_context->ZBUF.PSM == PSM_PSMZ24) {
max_z = 0xFFFFFF;
} else {
max_z = 0xFFFF;
// On the real GS we appear to do clamping on the max z value the format allows.
// Clamping is done after rasterization.
const uint32 max_z = 0xFFFFFFFF >> (GSLocalMemory::m_psm[m_context->ZBUF.PSM].fmt * 8);
const bool clamp_z = (uint32)(GSVector4i(m_vt.m_max.p).z) > max_z;
vs_cb.MaxDepth = GSVector2i(0xFFFFFFFF);
if (clamp_z) {
// FIXME: Do z clamping for sprites on vs, triangles on ps.
if (m_vt.m_primclass == GS_SPRITE_CLASS)
vs_cb.MaxDepth = GSVector2i(max_z);
}
// The real GS appears to do no masking based on the Z buffer format and writing larger Z values
// than the buffer supports seems to be an error condition on the real GS, causing it to crash.
// We are probably receiving bad coordinates from VU1 in these cases.
vs_cb.DepthMask = GSVector2i(max_z, max_z);
GSVertex* v = &m_vertex.buff[0];
// Minor optimization of a corner case (it allow to better emulate some alpha test effects)
if (m_om_dssel.ztst == ZTST_GEQUAL && m_vt.m_eq.z && v[0].XYZ.Z == max_z) {

4
plugins/GSdx/res/glsl/common_header.glsl
View File

@ -65,9 +65,9 @@ layout(std140, binding = 20) uniform cb20
vec4 TextureOffset;
uint DepthMask;
uint cb20_pad;
vec2 PointSize;
uint MaxDepth;
uint pad_cb20;
};
#endif

4
plugins/GSdx/res/glsl/tfx_vgs.glsl
View File

@ -44,8 +44,8 @@ void texture_coord()
void vs_main()
{
// Clamp to depth mask, gs doesn't wrap
highp uint z = min(i_z, DepthMask);
// Clamp to max depth, gs doesn't wrap
highp uint z = min(i_z, MaxDepth);
// pos -= 0.05 (1/320 pixel) helps avoiding rounding problems (integral part of pos is usually 5 digits, 0.05 is about as low as we can go)
// example: ceil(afterseveralvertextransformations(y = 133)) => 134 => line 133 stays empty

8
plugins/GSdx/res/tfx.fx
View File

@ -99,8 +99,8 @@ cbuffer cb0
float4 VertexScale;
float4 VertexOffset;
float4 Texture_Scale_Offset;
uint DepthMask;
uint3 _pad_cb0;
uint MaxDepth;
uint3 pad_cb0;
};
cbuffer cb1
@ -787,8 +787,8 @@ PS_OUTPUT ps_main(PS_INPUT input)
VS_OUTPUT vs_main(VS_INPUT input)
{
// Clamp to depth mask, gs doesn't wrap
input.z = min(input.z, DepthMask);
// Clamp to max depth, gs doesn't wrap
input.z = min(input.z, MaxDepth);
VS_OUTPUT output;