Move some variables into r_refdef structure.

1 files changed, 22 insertions, 31 deletions

diff --git a/src/refresh/sw/aclip.c b/src/refresh/sw/aclip.c
index 5a11110..20e280a 100644
--- a/src/refresh/sw/aclip.c
+++ b/src/refresh/sw/aclip.c
@@ -30,8 +30,7 @@ static void R_Alias_clip_z(finalvert_t *pfv0, finalvert_t *pfv1, finalvert_t *ou
 {
     float       scale;
 
-    scale = (ALIAS_Z_CLIP_PLANE - pfv0->xyz[2]) /
-            (pfv1->xyz[2] - pfv0->xyz[2]);
+    scale = (ALIAS_Z_CLIP_PLANE - pfv0->xyz[2]) / (pfv1->xyz[2] - pfv0->xyz[2]);
 
     out->xyz[0] = pfv0->xyz[0] + (pfv1->xyz[0] - pfv0->xyz[0]) * scale;
     out->xyz[1] = pfv0->xyz[1] + (pfv1->xyz[1] - pfv0->xyz[1]) * scale;
@@ -49,8 +48,7 @@ static void R_Alias_clip_left(finalvert_t *pfv0, finalvert_t *pfv1, finalvert_t
     float       scale;
 
     if (pfv0->v >= pfv1->v) {
-        scale = (float)(r_refdef.aliasvrect.x - pfv0->u) /
-                (pfv1->u - pfv0->u);
+        scale = (float)(r_refdef.vrect.x - pfv0->u) / (pfv1->u - pfv0->u);
         out->u  = pfv0->u  + (pfv1->u  - pfv0->u) * scale + 0.5;
         out->v  = pfv0->v  + (pfv1->v  - pfv0->v) * scale + 0.5;
         out->s  = pfv0->s  + (pfv1->s  - pfv0->s) * scale + 0.5;
@@ -58,8 +56,7 @@ static void R_Alias_clip_left(finalvert_t *pfv0, finalvert_t *pfv1, finalvert_t
         out->l  = pfv0->l  + (pfv1->l  - pfv0->l) * scale + 0.5;
         out->zi = pfv0->zi + (pfv1->zi - pfv0->zi) * scale + 0.5;
     } else {
-        scale = (float)(r_refdef.aliasvrect.x - pfv1->u) /
-                (pfv0->u - pfv1->u);
+        scale = (float)(r_refdef.vrect.x - pfv1->u) / (pfv0->u - pfv1->u);
         out->u  = pfv1->u  + (pfv0->u  - pfv1->u) * scale + 0.5;
         out->v  = pfv1->v  + (pfv0->v  - pfv1->v) * scale + 0.5;
         out->s  = pfv1->s  + (pfv0->s  - pfv1->s) * scale + 0.5;
@@ -74,8 +71,7 @@ static void R_Alias_clip_right(finalvert_t *pfv0, finalvert_t *pfv1, finalvert_t
     float       scale;
 
     if (pfv0->v >= pfv1->v) {
-        scale = (float)(r_refdef.aliasvrectright - pfv0->u) /
-                (pfv1->u - pfv0->u);
+        scale = (float)(r_refdef.vrectright - pfv0->u) / (pfv1->u - pfv0->u);
         out->u  = pfv0->u  + (pfv1->u  - pfv0->u) * scale + 0.5;
         out->v  = pfv0->v  + (pfv1->v  - pfv0->v) * scale + 0.5;
         out->s  = pfv0->s  + (pfv1->s  - pfv0->s) * scale + 0.5;
@@ -83,8 +79,7 @@ static void R_Alias_clip_right(finalvert_t *pfv0, finalvert_t *pfv1, finalvert_t
         out->l  = pfv0->l  + (pfv1->l  - pfv0->l) * scale + 0.5;
         out->zi = pfv0->zi + (pfv1->zi - pfv0->zi) * scale + 0.5;
     } else {
-        scale = (float)(r_refdef.aliasvrectright - pfv1->u) /
-                (pfv0->u - pfv1->u);
+        scale = (float)(r_refdef.vrectright - pfv1->u) / (pfv0->u - pfv1->u);
         out->u  = pfv1->u  + (pfv0->u  - pfv1->u) * scale + 0.5;
         out->v  = pfv1->v  + (pfv0->v  - pfv1->v) * scale + 0.5;
         out->s  = pfv1->s  + (pfv0->s  - pfv1->s) * scale + 0.5;
@@ -99,8 +94,7 @@ static void R_Alias_clip_top(finalvert_t *pfv0, finalvert_t *pfv1, finalvert_t *
     float       scale;
 
     if (pfv0->v >= pfv1->v) {
-        scale = (float)(r_refdef.aliasvrect.y - pfv0->v) /
-                (pfv1->v - pfv0->v);
+        scale = (float)(r_refdef.vrect.y - pfv0->v) / (pfv1->v - pfv0->v);
         out->u  = pfv0->u  + (pfv1->u  - pfv0->u) * scale + 0.5;
         out->v  = pfv0->v  + (pfv1->v  - pfv0->v) * scale + 0.5;
         out->s  = pfv0->s  + (pfv1->s  - pfv0->s) * scale + 0.5;
@@ -108,8 +102,7 @@ static void R_Alias_clip_top(finalvert_t *pfv0, finalvert_t *pfv1, finalvert_t *
         out->l  = pfv0->l  + (pfv1->l  - pfv0->l) * scale + 0.5;
         out->zi = pfv0->zi + (pfv1->zi - pfv0->zi) * scale + 0.5;
     } else {
-        scale = (float)(r_refdef.aliasvrect.y - pfv1->v) /
-                (pfv0->v - pfv1->v);
+        scale = (float)(r_refdef.vrect.y - pfv1->v) / (pfv0->v - pfv1->v);
         out->u  = pfv1->u  + (pfv0->u  - pfv1->u) * scale + 0.5;
         out->v  = pfv1->v  + (pfv0->v  - pfv1->v) * scale + 0.5;
         out->s  = pfv1->s  + (pfv0->s  - pfv1->s) * scale + 0.5;
@@ -125,8 +118,7 @@ static void R_Alias_clip_bottom(finalvert_t *pfv0, finalvert_t *pfv1,
     float       scale;
 
     if (pfv0->v >= pfv1->v) {
-        scale = (float)(r_refdef.aliasvrectbottom - pfv0->v) /
-                (pfv1->v - pfv0->v);
+        scale = (float)(r_refdef.vrectbottom - pfv0->v) / (pfv1->v - pfv0->v);
 
         out->u  = pfv0->u  + (pfv1->u  - pfv0->u) * scale + 0.5;
         out->v  = pfv0->v  + (pfv1->v  - pfv0->v) * scale + 0.5;
@@ -135,8 +127,7 @@ static void R_Alias_clip_bottom(finalvert_t *pfv0, finalvert_t *pfv1,
         out->l  = pfv0->l  + (pfv1->l  - pfv0->l) * scale + 0.5;
         out->zi = pfv0->zi + (pfv1->zi - pfv0->zi) * scale + 0.5;
     } else {
-        scale = (float)(r_refdef.aliasvrectbottom - pfv1->v) /
-                (pfv0->v - pfv1->v);
+        scale = (float)(r_refdef.vrectbottom - pfv1->v) / (pfv0->v - pfv1->v);
 
         out->u  = pfv1->u  + (pfv0->u  - pfv1->u) * scale + 0.5;
         out->v  = pfv1->v  + (pfv0->v  - pfv1->v) * scale + 0.5;
@@ -164,13 +155,13 @@ static int R_AliasClip(finalvert_t *in, finalvert_t *out, int flag, int count,
         if (oldflags ^ flags) {
             clip(&in[j], &in[i], &out[k]);
             out[k].flags = 0;
-            if (out[k].u < r_refdef.aliasvrect.x)
+            if (out[k].u < r_refdef.vrect.x)
                 out[k].flags |= ALIAS_LEFT_CLIP;
-            if (out[k].v < r_refdef.aliasvrect.y)
+            if (out[k].v < r_refdef.vrect.y)
                 out[k].flags |= ALIAS_TOP_CLIP;
-            if (out[k].u > r_refdef.aliasvrectright)
+            if (out[k].u > r_refdef.vrectright)
                 out[k].flags |= ALIAS_RIGHT_CLIP;
-            if (out[k].v > r_refdef.aliasvrectbottom)
+            if (out[k].v > r_refdef.vrectbottom)
                 out[k].flags |= ALIAS_BOTTOM_CLIP;
             k++;
         }
@@ -252,15 +243,15 @@ void R_AliasClipTriangle(finalvert_t *index0, finalvert_t *index1, finalvert_t *
     }
 
     for (i = 0; i < k; i++) {
-        if (fv[pingpong][i].u < r_refdef.aliasvrect.x)
-            fv[pingpong][i].u = r_refdef.aliasvrect.x;
-        else if (fv[pingpong][i].u > r_refdef.aliasvrectright)
-            fv[pingpong][i].u = r_refdef.aliasvrectright;
-
-        if (fv[pingpong][i].v < r_refdef.aliasvrect.y)
-            fv[pingpong][i].v = r_refdef.aliasvrect.y;
-        else if (fv[pingpong][i].v > r_refdef.aliasvrectbottom)
-            fv[pingpong][i].v = r_refdef.aliasvrectbottom;
+        if (fv[pingpong][i].u < r_refdef.vrect.x)
+            fv[pingpong][i].u = r_refdef.vrect.x;
+        else if (fv[pingpong][i].u > r_refdef.vrectright)
+            fv[pingpong][i].u = r_refdef.vrectright;
+
+        if (fv[pingpong][i].v < r_refdef.vrect.y)
+            fv[pingpong][i].v = r_refdef.vrect.y;
+        else if (fv[pingpong][i].v > r_refdef.vrectbottom)
+            fv[pingpong][i].v = r_refdef.vrectbottom;
 
         fv[pingpong][i].flags = 0;
     }