diff options
| author | Brian Paul <[email protected]> | 2001-05-21 18:13:43 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2001-05-21 18:13:43 +0000 |
| commit | 6b1e4ea5a54ea852a904440cd9fa50251f63f64c (patch) | |
| tree | 304c1948cf57fdd14f0e4b6102edae369873ab8a /src/mesa/swrast/s_lines.c | |
| parent | 300e1056f5ef56da8e7df8a689e5e66f57af3c3a (diff) | |
fixed a number of multi-texture line bugs
Diffstat (limited to 'src/mesa/swrast/s_lines.c')
| -rw-r--r-- | src/mesa/swrast/s_lines.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/src/mesa/swrast/s_lines.c b/src/mesa/swrast/s_lines.c index 19b0d9a1a4d..c5523a432cc 100644 --- a/src/mesa/swrast/s_lines.c +++ b/src/mesa/swrast/s_lines.c @@ -1,4 +1,4 @@ -/* $Id: s_lines.c,v 1.17 2001/05/17 09:32:17 keithw Exp $ */ +/* $Id: s_lines.c,v 1.18 2001/05/21 18:13:43 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -780,10 +780,9 @@ static void smooth_multitextured_line( GLcontext *ctx, pbspec[count][BCOMP] = FixedToInt(sb0); \ for (u = 0; u < ctx->Const.MaxTextureUnits; u++) { \ if (ctx->Texture.Unit[u]._ReallyEnabled) { \ - PB->s[u][0] = fragTexcoord[u][0]; \ - PB->s[u][1] = fragTexcoord[u][1]; \ - PB->s[u][2] = fragTexcoord[u][2]; \ - PB->s[u][3] = fragTexcoord[u][3]; \ + PB->s[u][count] = fragTexcoord[u][0]; \ + PB->t[u][count] = fragTexcoord[u][1]; \ + PB->u[u][count] = fragTexcoord[u][2]; \ } \ } \ count++; \ @@ -817,10 +816,9 @@ static void smooth_multitextured_line( GLcontext *ctx, pbspec[count][BCOMP] = FixedToInt(sb0); \ for (u = 0; u < ctx->Const.MaxTextureUnits; u++) { \ if (ctx->Texture.Unit[u]._ReallyEnabled) { \ - PB->s[u][0] = fragTexcoord[u][0]; \ - PB->s[u][1] = fragTexcoord[u][1]; \ - PB->s[u][2] = fragTexcoord[u][2]; \ - PB->s[u][3] = fragTexcoord[u][3]; \ + PB->s[u][count] = fragTexcoord[u][0]; \ + PB->t[u][count] = fragTexcoord[u][1]; \ + PB->u[u][count] = fragTexcoord[u][2]; \ } \ } \ count++; \ @@ -881,10 +879,9 @@ static void flat_multitextured_line( GLcontext *ctx, pbspec[count][BCOMP] = sBlue; \ for (u = 0; u < ctx->Const.MaxTextureUnits; u++) { \ if (ctx->Texture.Unit[u]._ReallyEnabled) { \ - PB->s[u][0] = fragTexcoord[u][0]; \ - PB->s[u][1] = fragTexcoord[u][1]; \ - PB->s[u][2] = fragTexcoord[u][2]; \ - PB->s[u][3] = fragTexcoord[u][3]; \ + PB->s[u][count] = fragTexcoord[u][0]; \ + PB->t[u][count] = fragTexcoord[u][1]; \ + PB->u[u][count] = fragTexcoord[u][2]; \ } \ } \ count++; \ @@ -916,10 +913,9 @@ static void flat_multitextured_line( GLcontext *ctx, pbspec[count][BCOMP] = sBlue; \ for (u = 0; u < ctx->Const.MaxTextureUnits; u++) { \ if (ctx->Texture.Unit[u]._ReallyEnabled) { \ - PB->s[u][0] = fragTexcoord[u][0]; \ - PB->s[u][1] = fragTexcoord[u][1]; \ - PB->s[u][2] = fragTexcoord[u][2]; \ - PB->s[u][3] = fragTexcoord[u][3]; \ + PB->s[u][count] = fragTexcoord[u][0]; \ + PB->t[u][count] = fragTexcoord[u][1]; \ + PB->u[u][count] = fragTexcoord[u][2]; \ } \ } \ count++; \ |