Fix propogation of material values in VB's that don't reach the lighting

stage.  (Materials now treated more like colors, etc.).

Continue whipping the dd templates into shape.

Remove old NormalLength code; may come back as a driver helper, but not
useful for, eg. hardware t&l drivers.

1 files changed, 1 insertions, 18 deletions

diff --git a/src/mesa/tnl/t_imm_fixup.c b/src/mesa/tnl/t_imm_fixup.c
index 54fd6670b1..5429994b6c 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.6 2001/02/13 23:51:34 brianp Exp $ */
+/* $Id: t_imm_fixup.c,v 1.7 2001/02/15 01:33:52 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -416,20 +416,6 @@ static void copy_vertices( GLcontext *ctx,
       next->CopyAndFlag &= prev->Flag[src]; /* redundant for current_im */
    }
    
-   /* Only needed when copying to a compiled cassette
-    */
-   if (next->NormalLengths) {
-      for (i = 0 ; i < count ; i++)
-      {
-	 GLuint src = elts[i+offset];
-	 GLuint dst = next->CopyStart+i;
-
-	 if (prev->NormalLengths) 
-	    next->NormalLengths[dst] = prev->NormalLengths[src];
-	 else
-	    next->NormalLengths[dst] = 1.0/LEN_3FV(prev->Normal[src]);
-      }
-   }
 
    ASSERT(prev == tnl->ExecCopySource);
 
@@ -549,9 +535,6 @@ void _tnl_fixup_compiled_cassette( GLcontext *ctx, struct immediate *IM )
       if (fixup & VERT_NORM) {
 	 fixup_first_3f(IM->Normal, IM->Flag, VERT_NORM, start,
 			ctx->Current.Normal );
-	 if (IM->NormalLengths)
-	    fixup_first_1f(IM->NormalLengths, IM->Flag, VERT_NORM, start,
-			   1.0F / (GLfloat) LEN_3FV(ctx->Current.Normal) );
       }
    }