Clean up translation of array elements, copying of elts in pure-elt

cassettes.  Fixes problem with isosurf/compiled-array-elt/strips.

1 files changed, 4 insertions, 15 deletions

diff --git a/src/mesa/tnl/t_imm_fixup.c b/src/mesa/tnl/t_imm_fixup.c
index 8bf0982a84..979fc0cdab 100644
--- a/src/mesa/tnl/t_imm_fixup.c
+++ b/src/mesa/tnl/t_imm_fixup.c
@@ -1,4 +1,4 @@
-/* $Id: t_imm_fixup.c,v 1.14 2001/05/03 16:11:16 brianp Exp $ */
+/* $Id: t_imm_fixup.c,v 1.15 2001/05/11 08:11:31 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -391,10 +391,6 @@ void _tnl_copy_immediate_vertices( GLcontext *ctx, struct immediate *next )
    }
 
    next->CopyStart = next->Start - count;
-/*     fprintf(stderr, "%s prim %s count %d source %p\n", */
-/*  	   __FUNCTION__,  */
-/*  	   _mesa_lookup_enum_by_nr(ctx->Driver.CurrentExecPrimitive), */
-/*  	   count, prev); */
 
    if ((prev->CopyOrFlag & VERT_DATA) == VERT_ELT &&
        ctx->Array.LockCount &&
@@ -406,20 +402,16 @@ void _tnl_copy_immediate_vertices( GLcontext *ctx, struct immediate *next )
       {
 	 GLuint src = elts[i+offset];
 	 GLuint dst = next->CopyStart+i;
-
 	 next->Elt[dst] = prev->Elt[src];
 	 next->Flag[dst] = VERT_ELT;
-	 next->CopyOrFlag |= VERT_ELT;
-	 next->CopyAndFlag &= VERT_ELT;
       }
+      next->CopyOrFlag |= VERT_ELT;
+      next->CopyAndFlag &= VERT_ELT;
    }
    else {
       /* prev->CopyOrFlag is hacked to include values generated by eval:
        */
       GLuint copy = tnl->pipeline.inputs & prev->CopyOrFlag;
-
-/*        _tnl_print_vert_flags(__FUNCTION__, copy); */
-	   
 	   
       next->TexSize |= tnl->ExecCopyTexSize;
 
@@ -431,8 +423,6 @@ void _tnl_copy_immediate_vertices( GLcontext *ctx, struct immediate *next )
 	 GLuint isrc = src - prev->CopyStart;
 	 GLuint dst = next->CopyStart+i;
 
-/*  	 fprintf(stderr, "src %d isrc %d dst %d\n", src, isrc, dst); */
-
 	 /* Values subject to eval must be copied out of the 'inputs'
 	  * struct.  (Copied rows should not be evaluated twice).
 	  *
@@ -500,8 +490,6 @@ void _tnl_fixup_compiled_cassette( GLcontext *ctx, struct immediate *IM )
    GLuint count = IM->Count;
    GLuint start = IM->Start;
 
-/*     fprintf(stderr, "%s\n", __FUNCTION__); */
-
    if (count == start)
       return;
 
@@ -837,3 +825,4 @@ void _tnl_upgrade_current_data( GLcontext *ctx,
       VB->importable_data &= ~VERT_RGBA;
    }
 }
+