diff --git a/include/r_local.h b/include/r_local.h index 34e558c09..ac14cc9d7 100644 --- a/include/r_local.h +++ b/include/r_local.h @@ -321,8 +321,8 @@ void R_Alias_clip_top (finalvert_t *pfv0, finalvert_t *pfv1, finalvert_t *out); void R_AliasSetUpTransform (int trivial_accept); void R_AliasTransformVector (vec3_t in, vec3_t out); -void R_AliasTransformFinalVert (finalvert_t *fv, auxvert_t *av, - trivertx_t *pverts, stvert_t *pstverts); +void R_AliasTransformFinalVert (finalvert_t *fv, trivertx_t *pverts, + stvert_t *pstverts); void R_AliasTransformAndProjectFinalVerts (finalvert_t *fv, stvert_t *pstverts); void R_GenerateSpans (void); diff --git a/libs/video/renderer/sw/sw_ralias.c b/libs/video/renderer/sw/sw_ralias.c index c3179c28e..f79cef11e 100644 --- a/libs/video/renderer/sw/sw_ralias.c +++ b/libs/video/renderer/sw/sw_ralias.c @@ -260,8 +260,7 @@ R_AliasClipAndProjectFinalVert (finalvert_t *fv, auxvert_t *av) } static void -R_AliasTransformFinalVert16 (finalvert_t *fv, auxvert_t *av, - trivertx_t *pverts) +R_AliasTransformFinalVert16 (auxvert_t *av, trivertx_t *pverts) { trivertx_t * pextra; float vextra[3]; @@ -279,7 +278,7 @@ R_AliasTransformFinalVert16 (finalvert_t *fv, auxvert_t *av, } static void -R_AliasTransformFinalVert8 (finalvert_t *fv, auxvert_t *av, trivertx_t *pverts) +R_AliasTransformFinalVert8 (auxvert_t *av, trivertx_t *pverts) { av->fv[0] = DotProduct (pverts->v, aliastransform[0]) + aliastransform[0][3]; @@ -312,15 +311,15 @@ R_AliasPreparePoints (void) if (pmdl->ident == HEADER_MDL16) { for (i = 0; i < r_anumverts; i++, fv++, av++, r_apverts++, pstverts++) { - R_AliasTransformFinalVert16 (fv, av, r_apverts); - R_AliasTransformFinalVert (fv, av, r_apverts, pstverts); + R_AliasTransformFinalVert16 (av, r_apverts); + R_AliasTransformFinalVert (fv, r_apverts, pstverts); R_AliasClipAndProjectFinalVert (fv, av); } } else { for (i = 0; i < r_anumverts; i++, fv++, av++, r_apverts++, pstverts++) { - R_AliasTransformFinalVert8 (fv, av, r_apverts); - R_AliasTransformFinalVert (fv, av, r_apverts, pstverts); + R_AliasTransformFinalVert8 (av, r_apverts); + R_AliasTransformFinalVert (fv, r_apverts, pstverts); R_AliasClipAndProjectFinalVert (fv, av); } } @@ -420,8 +419,8 @@ R_AliasSetUpTransform (int trivial_accept) lighting actual 3D transform is done by R_AliasTransformFinalVert8/16 functions above */ void -R_AliasTransformFinalVert (finalvert_t *fv, auxvert_t *av, - trivertx_t *pverts, stvert_t *pstverts) +R_AliasTransformFinalVert (finalvert_t *fv, trivertx_t *pverts, + stvert_t *pstverts) { int temp; float lightcos, *plightnormal; diff --git a/libs/video/renderer/sw32/sw32_ralias.c b/libs/video/renderer/sw32/sw32_ralias.c index 7645024a1..d15038db0 100644 --- a/libs/video/renderer/sw32/sw32_ralias.c +++ b/libs/video/renderer/sw32/sw32_ralias.c @@ -265,7 +265,7 @@ R_AliasClipAndProjectFinalVert (finalvert_t *fv, auxvert_t *av) } static void -R_AliasTransformFinalVert16 (finalvert_t *fv, auxvert_t *av, trivertx_t *pverts) +R_AliasTransformFinalVert16 (auxvert_t *av, trivertx_t *pverts) { trivertx_t * pextra; float vextra[3]; @@ -283,7 +283,7 @@ R_AliasTransformFinalVert16 (finalvert_t *fv, auxvert_t *av, trivertx_t *pverts) } static void -R_AliasTransformFinalVert8 (finalvert_t *fv, auxvert_t *av, trivertx_t *pverts) +R_AliasTransformFinalVert8 (auxvert_t *av, trivertx_t *pverts) { av->fv[0] = DotProduct (pverts->v, aliastransform[0]) + aliastransform[0][3]; @@ -316,16 +316,16 @@ R_AliasPreparePoints (void) if (pmdl->ident == HEADER_MDL16) { for (i = 0; i < r_anumverts; i++, fv++, av++, sw32_r_apverts++, pstverts++) { - R_AliasTransformFinalVert16 (fv, av, sw32_r_apverts); - sw32_R_AliasTransformFinalVert (fv, av, sw32_r_apverts, pstverts); + R_AliasTransformFinalVert16 (av, sw32_r_apverts); + sw32_R_AliasTransformFinalVert (fv, sw32_r_apverts, pstverts); R_AliasClipAndProjectFinalVert (fv, av); } } else { for (i = 0; i < r_anumverts; i++, fv++, av++, sw32_r_apverts++, pstverts++) { - R_AliasTransformFinalVert8 (fv, av, sw32_r_apverts); - sw32_R_AliasTransformFinalVert (fv, av, sw32_r_apverts, pstverts); + R_AliasTransformFinalVert8 (av, sw32_r_apverts); + sw32_R_AliasTransformFinalVert (fv, sw32_r_apverts, pstverts); R_AliasClipAndProjectFinalVert (fv, av); } } @@ -425,8 +425,8 @@ now this function just copies the texture coordinates and calculates lighting actual 3D transform is done by R_AliasTransformFinalVert8/16 functions above */ void -sw32_R_AliasTransformFinalVert (finalvert_t *fv, auxvert_t *av, - trivertx_t *pverts, stvert_t *pstverts) +sw32_R_AliasTransformFinalVert (finalvert_t *fv, trivertx_t *pverts, + stvert_t *pstverts) { int temp; float lightcos, *plightnormal;