preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-08 05:33:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correct scale factors for through mode depth rounding.

Browse Source
This commit is contained in:
Henrik Rydgard
2015-08-26 15:55:58 +02:00
parent 9e18fb7e90
commit fee776b6e0
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPU/GLES/ShaderManager.cpp
+1 -1
View File
@@ -449,7 +449,7 @@ void LinkedShader::UpdateUniforms(u32 vertType) {
if (dirty & DIRTY_PROJTHROUGHMATRIX)
{
Matrix4x4 proj_through;
proj_through.setOrtho(0.0f, gstate_c.curRTWidth, gstate_c.curRTHeight, 0, 0, 1);
proj_through.setOrtho(0.0f, gstate_c.curRTWidth, gstate_c.curRTHeight, 0, 0.0f, 1.0f);
glUniformMatrix4fv(u_proj_through, 1, GL_FALSE, proj_through.getReadPtr());
}
if (dirty & DIRTY_TEXENV) {
GPU/GLES/VertexShaderGenerator.cpp
+5 -6
View File
@@ -391,17 +391,16 @@ void GenerateVertexShader(int prim, u32 vertType, char *buffer, bool useHWTransf
// See comment above this function (GenerateVertexShader).
WRITE(p, "\nvec4 depthRoundZ(vec4 v) {\n");
WRITE(p, " return vec4(v.x, v.y, (1.0/65536.0) * floor(v.z * 65536.0), v.w);\n");
WRITE(p, " return vec4(v.x, v.y, (1.0/65535.0) * floor(v.z * 65535.0), v.w);\n");
WRITE(p, "}\n\n");
if (!gstate.isModeThrough()) {
// Apply the transform to get the Z buffer value, floor to integer, undo the transform.
// Apply the projection and viewport to get the Z buffer value, floor to integer, undo the viewport and projection.
WRITE(p, "\nvec4 depthRoundZVP(vec4 v) {\n");
WRITE(p, " float z = v.z / v.w;\n");
WRITE(p, " z *= u_depthRange.x;\n");
WRITE(p, " z += u_depthRange.y;\n");
WRITE(p, " z = ceil(z);\n");
WRITE(p, " z -= u_depthRange.y;\n");
WRITE(p, " z = z * u_depthRange.x + u_depthRange.y;\n");
WRITE(p, " z = floor(z);\n");
WRITE(p, " z = (z - u_depthRange.y) / u_depthRange.z;\n");
WRITE(p, " z /= u_depthRange.x;\n");
WRITE(p, " return vec4(v.x, v.y, z * v.w, v.w);\n");
WRITE(p, "}\n\n");