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

WIP asserts

This commit is contained in:
Jannik Vogel 2015-07-28 00:50:55 +02:00
parent d2fa51bb82
commit 92d79c8a7d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/xbox/nv2a_shaders.c
View File

@ -239,7 +239,7 @@ static QString* generate_fixed_function(const ShaderState state,
} }
/* Texgen */ /* Texgen */
for (i = 0; i < 4 /* NV2A_MAX_TEXTURES */; i++) { for (i = 0; i < 4 /* FIXME: NV2A_MAX_TEXTURES */; i++) {
qstring_append_fmt(s, "/* Texgen for stage %d */\n", qstring_append_fmt(s, "/* Texgen for stage %d */\n",
i); i);
qstring_append_fmt(s, "vec4 tTexture%d;\n", qstring_append_fmt(s, "vec4 tTexture%d;\n",
@ -258,21 +258,23 @@ static QString* generate_fixed_function(const ShaderState state,
case TEXGEN_EYE_LINEAR: case TEXGEN_EYE_LINEAR:
qstring_append_fmt(s, "tTexture%d.%c = dot(tTexPlane%c%d, tPosition);\n", qstring_append_fmt(s, "tTexture%d.%c = dot(tTexPlane%c%d, tPosition);\n",
i, c, cSuffix, i); i, c, cSuffix, i);
assert(false); /* Untested */
break; break;
case TEXGEN_OBJECT_LINEAR: case TEXGEN_OBJECT_LINEAR:
qstring_append_fmt(s, "tTexture%d.%c = dot(texPlane%c%d, position);\n", qstring_append_fmt(s, "tTexture%d.%c = dot(texPlane%c%d, position);\n",
i, c, cSuffix, i); i, c, cSuffix, i);
assert(false); /* Untested */
break; break;
case TEXGEN_SPHERE_MAP: case TEXGEN_SPHERE_MAP:
assert(i < 2); /* Channels S,T only! */ assert(i < 2); /* Channels S,T only! */
qstring_append(s, "{\n"); qstring_append(s, "{\n");
/* FIXME: r and m only have to be calculated once */ /* FIXME: u, r and m only have to be calculated once */
qstring_append(s, " vec3 u = normalize(tPosition.xyz);\n"); qstring_append(s, " vec3 u = normalize(tPosition.xyz);\n");
//FIXME: tNormal before or after normalization? Always normalize? //FIXME: tNormal before or after normalization? Always normalize?
qstring_append(s, " vec3 r = reflect(u, tNormal);\n"); qstring_append(s, " vec3 r = reflect(u, tNormal);\n");
/* FIXME: This would consume 1 division fewer and *might* be /* FIXME: This would consume 1 division fewer and *might* be
* faster than `length`: * faster than length:
* // [z=1/(2*x) => z=1/x*0.5] * // [z=1/(2*x) => z=1/x*0.5]
* vec3 ro = r + vec3(0.0, 0.0, 1.0); * vec3 ro = r + vec3(0.0, 0.0, 1.0);
* float m = inversesqrt(dot(ro,ro))*0.5; * float m = inversesqrt(dot(ro,ro))*0.5;
@ -282,6 +284,7 @@ static QString* generate_fixed_function(const ShaderState state,
qstring_append_fmt(s, " tTexture%d.%c = r.%c * invM + 0.5;\n", qstring_append_fmt(s, " tTexture%d.%c = r.%c * invM + 0.5;\n",
i, c, c); i, c, c);
qstring_append(s, "}\n"); qstring_append(s, "}\n");
assert(false); /* Untested */
break; break;
case TEXGEN_REFLECTION_MAP: case TEXGEN_REFLECTION_MAP:
assert(i < 3); /* Channels S,T,R only! */ assert(i < 3); /* Channels S,T,R only! */