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

use actual surface size to fix vsh output

This commit is contained in:
espes 2015-08-14 15:20:31 +10:00
parent 779d4d4734
commit 138140c44f
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xbox/nv2a.c
View File

@ -2986,10 +2986,18 @@ static void pgraph_bind_shaders(PGRAPHState *pg)
}
GLint loc = glGetUniformLocation(pg->shader_binding->gl_program,
"clipRange");
"surfaceSize");
if (loc != -1) {
glUniform2f(loc, pg->surface_shape.clip_width,
pg->surface_shape.clip_height);
}
loc = glGetUniformLocation(pg->shader_binding->gl_program,
"clipRange");
if (loc != -1) {
glUniform2f(loc, zclip_min, zclip_max);
}
}
NV2A_GL_DGROUP_END();
}

14
hw/xbox/nv2a_vsh.c
View File

@ -569,9 +569,8 @@ static const char* vsh_header =
/* All constants in 1 array declaration */
"uniform vec4 c[192];\n"
"\n"
"#define viewportScale c[58]\n"
"#define viewportOffset c[59]\n"
"uniform vec2 clipRange;\n"
"uniform vec2 surfaceSize;\n"
/* See:
* http://msdn.microsoft.com/en-us/library/windows/desktop/bb174703%28v=vs.85%29.aspx
@ -772,7 +771,7 @@ QString* vsh_translate(uint16_t version,
* around the perspective divide */
qstring_append(body,
"if (oPos.w == 0.0 || isinf(oPos.w)) {\n"
" vtx.inv_w = 1.0;"
" vtx.inv_w = 1.0;\n"
"} else {\n"
" vtx.inv_w = 1.0 / oPos.w;\n"
"}\n");
@ -789,13 +788,10 @@ QString* vsh_translate(uint16_t version,
qstring_append(body,
/* the shaders leave the result in screen space, while
* opengl expects it in clip space.
* TODO: the pixel-center co-ordinate differences should handled
*/
/* Use magic viewport constants to translate xyz back into clip space
* TODO: Are they always present?
*/
"oPos.x = (oPos.x - viewportOffset.x) / viewportScale.x;\n"
"oPos.y = (oPos.y - viewportOffset.y) / viewportScale.y;\n"
"oPos.x = 2.0 * (oPos.x - surfaceSize.x * 0.5) / surfaceSize.x;\n"
"oPos.y = -2.0 * (oPos.y - surfaceSize.y * 0.5) / surfaceSize.y;\n"
"if (clipRange.y != clipRange.x) {\n"
" oPos.z = (oPos.z - 0.5 * (clipRange.x + clipRange.y)) / (0.5 * (clipRange.y - clipRange.x));\n"
"}\n"