Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Improve depth buffering in D3D by computing a depth-flipped proj matrix but only when needed.

Browse source
This commit is contained in:
Henrik Rydgard 2014-09-08 23:10:23 +02:00
parent 780ed765c7
commit 01a1438dce
5 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
GPU/Directx9/ShaderManagerDX9.cpp
View file

@ -255,19 +255,13 @@ void LinkedShaderDX9::SetMatrix(D3DXHANDLE uniform, const float* pMatrix) {
m_vs->constant->SetMatrix(pD3Ddevice, uniform, pDxMat);
}
// Depth in ogl is between -1;1 we need between 0;1
// Pretty sure this is wrong, our Z buffer is screwed up anyhow..
void ConvertProjMatrixToD3D(Matrix4x4 & in) {
/*
in.zz *= 0.5f;
in.wz += 1.f;
*/
// Depth in ogl is between -1;1 we need between 0;1 and optionally reverse it
void ConvertProjMatrixToD3D(Matrix4x4 & in, bool invert) {
Matrix4x4 s;
Matrix4x4 t;
s.setScaling(Vec3(1, 1, 0.5f));
s.setScaling(Vec3(1, 1, invert ? -0.5 : 0.5f));
t.setTranslation(Vec3(0, 0, 0.5f));
in = in * s;
in = in * t;
in = in * s * t;
}
void LinkedShaderDX9::use() {
@ -297,8 +291,14 @@ void LinkedShaderDX9::updateUniforms() {
flippedMatrix[0] = -flippedMatrix[0];
flippedMatrix[12] = -flippedMatrix[12];
}
bool invert = false;
if (gstate_c.vpDepth < 0) {
invert = true;
//flippedMatrix[9] = -flippedMatrix[9];
//flippedMatrix[14] = -flippedMatrix[14];
}
// Convert matrices !
ConvertProjMatrixToD3D(flippedMatrix);
ConvertProjMatrixToD3D(flippedMatrix, invert);
SetMatrix(u_proj, flippedMatrix.getReadPtr());
}
@ -308,7 +308,7 @@ void LinkedShaderDX9::updateUniforms() {
proj_through.setOrtho(0.0f, gstate_c.curRTWidth, gstate_c.curRTHeight, 0, 0, 1);
// Convert matrices !
ConvertProjMatrixToD3D(proj_through);
ConvertProjMatrixToD3D(proj_through, false);
SetMatrix(u_proj_through, proj_through.getReadPtr());
}

10
GPU/Directx9/StateMappingDX9.cpp
View file

@ -381,7 +381,6 @@ void TransformDrawEngineDX9::ApplyDrawState(int prim) {
float vpY0 = vpYb - offsetY + vpYa; // Need to account for sign of Y
gstate_c.vpWidth = vpXa * 2.0f;
gstate_c.vpHeight = -vpYa * 2.0f;
float vpWidth = fabsf(gstate_c.vpWidth);
float vpHeight = fabsf(gstate_c.vpHeight);
@ -399,8 +398,13 @@ void TransformDrawEngineDX9::ApplyDrawState(int prim) {
float zScale = getFloat24(gstate.viewportz1) / 65535.0f;
float zOff = getFloat24(gstate.viewportz2) / 65535.0f;
float depthRangeMin = zOff - zScale;
float depthRangeMax = zOff + zScale;
float depthRangeMin = zOff - fabsf(zScale);
float depthRangeMax = zOff + fabsf(zScale);
gstate_c.vpDepth = zScale * 2;
// D3D does not like viewports outside the screen. Let's clamp for now.
dxstate.viewport.set(vpX0 + renderX, vpY0 + renderY, vpWidth, vpHeight, depthRangeMin, depthRangeMax);
}

2
GPU/Directx9/VertexShaderGeneratorDX9.cpp
View file

@ -593,7 +593,7 @@ void GenerateVertexShaderDX9(int prim, char *buffer, bool useHWTransform) {
}
WRITE(p, "Out.gl_Position.z = (Out.gl_Position.z + Out.gl_Position.w) * 0.5f;");
// WRITE(p, "Out.gl_Position.z = (Out.gl_Position.z + Out.gl_Position.w) * 0.5f;");
WRITE(p, " return Out; ");
WRITE(p, "}\n");
}

7
GPU/GPUState.cpp
View file

@ -266,7 +266,7 @@ struct GPUStateCache_v0
};
void GPUStateCache::DoState(PointerWrap &p) {
auto s = p.Section("GPUStateCache", 0, 3);
auto s = p.Section("GPUStateCache", 0, 4);
if (!s) {
// Old state, this was not versioned.
GPUStateCache_v0 old;
@ -328,6 +328,11 @@ void GPUStateCache::DoState(PointerWrap &p) {
p.Do(vpWidth);
p.Do(vpHeight);
if (s >= 4) {
p.Do(vpDepth);
} else {
vpDepth = 1.0f; // any positive value should be fine
}
p.Do(curRTWidth);
p.Do(curRTHeight);

1
GPU/GPUState.h
View file

@ -475,6 +475,7 @@ struct GPUStateCache
float vpWidth;
float vpHeight;
float vpDepth;
u32 curRTWidth;
u32 curRTHeight;