summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2003-12-09 15:33:45 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2003-12-09 15:33:45 +0000
commit47909141985a5aa38a49ea45b3aea795f1922dfb (patch)
tree874cf7a4bceee93378e5dac2e297d976c52f9fa5 /src
parent688193800789d0ad883ca72edf2da392295cf734 (diff)
Fix incorrect removal of PRIM_PARITY code (ie remove the parity code, not the
non-parity code).
Diffstat (limited to 'src')
-rw-r--r--src/mesa/tnl_dd/t_dd_dmatmp2.h25
1 files changed, 2 insertions, 23 deletions
diff --git a/src/mesa/tnl_dd/t_dd_dmatmp2.h b/src/mesa/tnl_dd/t_dd_dmatmp2.h
index dd0286b453..46a35de06a 100644
--- a/src/mesa/tnl_dd/t_dd_dmatmp2.h
+++ b/src/mesa/tnl_dd/t_dd_dmatmp2.h
@@ -345,29 +345,8 @@ static void TAG(render_tri_strip_verts)( GLcontext *ctx,
CLOSE_ELTS();
}
}
- else if (HAVE_TRI_STRIP_1)
- EMIT_PRIM( ctx, GL_TRIANGLE_STRIP, HW_TRIANGLE_STRIP_1, start, count );
- else {
- /* Emit the first triangle with elts, then the rest as a regular strip.
- * TODO: Make this unlikely in t_imm_api.c
- */
- ELT_TYPE *dest;
-
- ELT_INIT( GL_TRIANGLES, HW_TRIANGLES );
- dest = ALLOC_ELTS( 3 );
- EMIT_ELT( dest, 0, (start+1) );
- EMIT_ELT( dest, 1, (start+0) );
- EMIT_ELT( dest, 2, (start+2) );
- dest += 3;
- CLOSE_ELTS();
-
- start++;
- if (start + 2 >= count)
- return;
-
- EMIT_PRIM( ctx, GL_TRIANGLE_STRIP, HW_TRIANGLE_STRIP_0, start,
- count );
- }
+ else
+ EMIT_PRIM( ctx, GL_TRIANGLE_STRIP, HW_TRIANGLE_STRIP_0, start, count );
}
static void TAG(render_tri_fan_verts)( GLcontext *ctx,