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

nv2a: Fix FFP texgen assertions 

Should compare against channel index instead of texture stage index
This commit is contained in:
Voxel9 2020-06-27 21:21:50 +01:00 committed by espes
parent 48993e472e
commit 316513964a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xbox/nv2a/nv2a_shaders.c
View File

@ -431,7 +431,7 @@ GLSL_DEFINE(sceneAmbientColor, GLSL_LTCTXA(NV_IGRAPH_XF_LTCTXA_FR_AMB) ".xyz")
assert(false); /* Untested */ assert(false); /* Untested */
break; break;
case TEXGEN_SPHERE_MAP: case TEXGEN_SPHERE_MAP:
assert(i < 2); /* Channels S,T only! */ assert(j < 2); /* Channels S,T only! */
qstring_append(body, "{\n"); qstring_append(body, "{\n");
/* FIXME: u, r and m only have to be calculated once */ /* FIXME: u, r and m only have to be calculated once */
qstring_append(body, " vec3 u = normalize(tPosition.xyz);\n"); qstring_append(body, " vec3 u = normalize(tPosition.xyz);\n");
@ -451,7 +451,7 @@ GLSL_DEFINE(sceneAmbientColor, GLSL_LTCTXA(NV_IGRAPH_XF_LTCTXA_FR_AMB) ".xyz")
qstring_append(body, "}\n"); qstring_append(body, "}\n");
break; break;
case TEXGEN_REFLECTION_MAP: case TEXGEN_REFLECTION_MAP:
assert(i < 3); /* Channels S,T,R only! */ assert(j < 3); /* Channels S,T,R only! */
qstring_append(body, "{\n"); qstring_append(body, "{\n");
/* FIXME: u and r only have to be calculated once, can share the one from SPHERE_MAP */ /* FIXME: u and r only have to be calculated once, can share the one from SPHERE_MAP */
qstring_append(body, " vec3 u = normalize(tPosition.xyz);\n"); qstring_append(body, " vec3 u = normalize(tPosition.xyz);\n");
@ -461,7 +461,7 @@ GLSL_DEFINE(sceneAmbientColor, GLSL_LTCTXA(NV_IGRAPH_XF_LTCTXA_FR_AMB) ".xyz")
qstring_append(body, "}\n"); qstring_append(body, "}\n");
break; break;
case TEXGEN_NORMAL_MAP: case TEXGEN_NORMAL_MAP:
assert(i < 3); /* Channels S,T,R only! */ assert(j < 3); /* Channels S,T,R only! */
qstring_append_fmt(body, "oT%d.%c = tNormal.%c;\n", qstring_append_fmt(body, "oT%d.%c = tNormal.%c;\n",
i, c, c); i, c, c);
break; break;