Imported the Savage DRI driver from the savage-2-0-0-branch of DRI CVS

[mesa.git] / src / mesa / tnl_dd / t_dd_dmatmp2.h

diff --git a/src/mesa/tnl_dd/t_dd_dmatmp2.h b/src/mesa/tnl_dd/t_dd_dmatmp2.h
index 3f58d24c9523b98aba8ec8f8ab5ca145de35979e..46a35de06a9d3a9719c9f99613a022a8ad4309a0 100644 (file)
--- 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,31 +345,8 @@ static void TAG(render_tri_strip_verts)( GLcontext *ctx,
         CLOSE_ELTS();
       }
    }
-   else if ((flags & PRIM_PARITY) == 0)  
+   else
       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 {
-      /* 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 );
-   }
 }
 
 static void TAG(render_tri_fan_verts)( GLcontext *ctx,
@@ -757,18 +731,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();
    }
 }