diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2003-11-24 15:23:18 +0000 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2003-11-24 15:23:18 +0000 |
commit | ae0eaf93e092ac8e8b1c98f3e986de96940663fa (patch) | |
tree | 56aae7c4b985f657384df5e088227c4dd08130fb /src/mesa/tnl_dd/t_dd_dmatmp2.h | |
parent | 57c9814b9e87924696df4c741861c29d4236d1eb (diff) | |
download | external_mesa3d-ae0eaf93e092ac8e8b1c98f3e986de96940663fa.zip external_mesa3d-ae0eaf93e092ac8e8b1c98f3e986de96940663fa.tar.gz external_mesa3d-ae0eaf93e092ac8e8b1c98f3e986de96940663fa.tar.bz2 |
Merge vtx-0-2-branch
Diffstat (limited to 'src/mesa/tnl_dd/t_dd_dmatmp2.h')
-rw-r--r-- | src/mesa/tnl_dd/t_dd_dmatmp2.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/mesa/tnl_dd/t_dd_dmatmp2.h b/src/mesa/tnl_dd/t_dd_dmatmp2.h index 3f58d24..dd0286b 100644 --- a/src/mesa/tnl_dd/t_dd_dmatmp2.h +++ b/src/mesa/tnl_dd/t_dd_dmatmp2.h @@ -323,9 +323,6 @@ static void TAG(render_tri_strip_verts)( GLcontext *ctx, ELT_INIT( GL_TRIANGLES, HW_TRIANGLES ); - if (flags & PRIM_PARITY) - parity = 1; - /* Emit even number of tris in each full buffer. */ dmasz = dmasz/3; @@ -348,8 +345,6 @@ static void TAG(render_tri_strip_verts)( GLcontext *ctx, CLOSE_ELTS(); } } - else if ((flags & PRIM_PARITY) == 0) - EMIT_PRIM( ctx, GL_TRIANGLE_STRIP, HW_TRIANGLE_STRIP_0, start, count ); else if (HAVE_TRI_STRIP_1) EMIT_PRIM( ctx, GL_TRIANGLE_STRIP, HW_TRIANGLE_STRIP_1, start, count ); else { @@ -757,18 +752,9 @@ static void TAG(render_tri_strip_elts)( GLcontext *ctx, for (j = start ; j + 2 < count; j += nr - 2 ) { nr = MIN2( dmasz, count - j ); - if (flags & PRIM_PARITY) { - dest = ALLOC_ELTS( nr ); - dest = TAG(emit_elts)( ctx, dest, elts+j, 1 ); - dest = TAG(emit_elts)( ctx, dest, elts+j, nr-1 ); - nr--; flags &= ~PRIM_PARITY; - CLOSE_ELTS(); - } - else { - dest = ALLOC_ELTS( nr ); - dest = TAG(emit_elts)( ctx, dest, elts+j, nr ); - CLOSE_ELTS(); - } + dest = ALLOC_ELTS( nr ); + dest = TAG(emit_elts)( ctx, dest, elts+j, nr ); + CLOSE_ELTS(); } } |