disable debug printf's, fix a crash

diff --git a/src/mesa/tnl/t_imm_api.c b/src/mesa/tnl/t_imm_api.c
index a4cb4845beb809c26889bca40b1db37ad3e08ad5..d79f962269587f0263c7a7d30f5d6f18fef354e6 100644 (file)
--- a/src/mesa/tnl/t_imm_api.c
+++ b/src/mesa/tnl/t_imm_api.c
@@ -1,4 +1,4 @@
-/* $Id: t_imm_api.c,v 1.20 2001/12/14 02:51:44 brianp Exp $ */
+/* $Id: t_imm_api.c,v 1.21 2001/12/15 02:13:32 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -38,6 +38,7 @@
 #include "state.h"
 #include "colormac.h"
 #include "macros.h"
+#include "vtxfmt.h"
 
 #include "t_context.h"
 #include "t_imm_api.h"
@@ -104,7 +105,8 @@ _tnl_begin( GLcontext *ctx, GLenum p )
       _tnl_vprog_vtxfmt_init(ctx);
    else
       _tnl_imm_vtxfmt_init(ctx);
-   _mesa_init_exec_vtxfmt(ctx);
+   /* XXX this should not be done here - inefficient */
+   _mesa_install_exec_vtxfmt(ctx, &(TNL_CONTEXT(ctx)->vtxfmt));
 
    /* if only a very few slots left, might as well flush now
     */
@@ -1241,8 +1243,6 @@ void _tnl_imm_vtxfmt_init( GLcontext *ctx )
 {
    GLvertexformat *vfmt = &(TNL_CONTEXT(ctx)->vtxfmt);
 
-   printf("%s()\n", __FUNCTION__);
-
    /* All begin/end operations are handled by this vertex format:
     */
    vfmt->ArrayElement = _tnl_ArrayElement;

diff --git a/src/mesa/tnl/t_imm_exec.c b/src/mesa/tnl/t_imm_exec.c
index 58c46c4777c2a53da123533116e907ec7e60f38d..4eceb7985a5a7d402a1de702c310d26b269e4b24 100644 (file)
--- a/src/mesa/tnl/t_imm_exec.c
+++ b/src/mesa/tnl/t_imm_exec.c
@@ -1,4 +1,4 @@
-/* $Id: t_imm_exec.c,v 1.31 2001/12/14 02:51:45 brianp Exp $ */
+/* $Id: t_imm_exec.c,v 1.32 2001/12/15 02:13:32 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -463,7 +463,6 @@ void _tnl_execute_cassette( GLcontext *ctx, struct immediate *IM )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
 
-   printf("enter %s()\n", __FUNCTION__);
    _tnl_compute_orflag( IM, IM->Start );
    _tnl_copy_immediate_vertices( ctx, IM ); 
    _tnl_get_exec_copy_verts( ctx, IM );
@@ -471,7 +470,6 @@ void _tnl_execute_cassette( GLcontext *ctx, struct immediate *IM )
    if (tnl->pipeline.build_state_changes)
       _tnl_validate_pipeline( ctx );
 
-   printf("  CopyStart %d == Count %d ?\n", IM->CopyStart, IM->Count);
    if (IM->CopyStart == IM->Count) {
       exec_empty_cassette( ctx, IM );
    }
@@ -504,7 +502,6 @@ void _tnl_execute_cassette( GLcontext *ctx, struct immediate *IM )
 
    if (ctx->Driver.CurrentExecPrimitive == GL_POLYGON+1)
       ctx->Driver.NeedFlush &= ~FLUSH_STORED_VERTICES;
-   printf("leave %s()\n", __FUNCTION__);
 }
 
 

diff --git a/src/mesa/tnl/t_imm_fixup.c b/src/mesa/tnl/t_imm_fixup.c
index 8da694a9e3cd3d2af1a806e14f45092c676acf39..83b31783e23d76742aa2f706871009ba32f5d122 100644 (file)
--- 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.29 2001/12/14 02:51:45 brianp Exp $ */
+/* $Id: t_imm_fixup.c,v 1.30 2001/12/15 02:13:32 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -421,7 +421,6 @@ void _tnl_copy_immediate_vertices( GLcontext *ctx, struct immediate *next )
    }
 
    next->CopyStart = next->Start - count;
-   printf("%s() CopyStart = %d\n", __FUNCTION__, next->CopyStart);
 
    if ((prev->CopyOrFlag & VERT_DATA) == VERT_ELT &&
        ctx->Array.LockCount &&

diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c
index 6e39788f9d6e8638047b75d458953ada2af8a946..f92e21fe4817d751ed64be93a173d678390223f3 100644 (file)
--- a/src/mesa/tnl/t_pipeline.c
+++ b/src/mesa/tnl/t_pipeline.c
@@ -1,4 +1,4 @@
-/* $Id: t_pipeline.c,v 1.20 2001/12/14 02:51:45 brianp Exp $ */
+/* $Id: t_pipeline.c,v 1.21 2001/12/15 02:13:32 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -131,8 +131,6 @@ void _tnl_run_pipeline( GLcontext *ctx )
    pipe->run_state_changes = 0;
    pipe->run_input_changes = 0;
 
-   printf("%s()\n", __FUNCTION__);
-
    /* Done elsewhere.
     */
    ASSERT(pipe->build_state_changes == 0);

diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index 29a6ca5e65d4439ac8e8c818a314b85af4216e52..19cf7d6036b8be625839b77980942b73e248271a 100644 (file)
--- a/src/mesa/tnl/t_vb_program.c
+++ b/src/mesa/tnl/t_vb_program.c
@@ -1,4 +1,4 @@
-/* $Id: t_vb_program.c,v 1.1 2001/12/14 02:51:45 brianp Exp $ */
+/* $Id: t_vb_program.c,v 1.2 2001/12/15 02:13:32 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -764,6 +764,12 @@ static GLboolean run_vp( GLcontext *ctx, struct gl_pipeline_stage *stage )
              VB->AttribPtr[3]->data[i][1],
              VB->AttribPtr[3]->data[i][2],
              VB->AttribPtr[3]->data[i][3]);
+      printf("  normal: %f, %f, %f, %f\n",
+             VB->AttribPtr[2]->data[i][0],
+             VB->AttribPtr[2]->data[i][1],
+             VB->AttribPtr[2]->data[i][2],
+             VB->AttribPtr[2]->data[i][3]);
+
 
       /* load the input attribute registers */
       for (attr = 0; attr < 16; attr++) {
@@ -969,7 +975,7 @@ static GLboolean run_init_vp( GLcontext *ctx,
 static void check_vp( GLcontext *ctx, struct gl_pipeline_stage *stage )
 {
    stage->active = ctx->VertexProgram.Enabled;
-   printf("check_vp() active = %d\n", stage->active);
+
    if (stage->active) {
 #if 000
       if (stage->privatePtr)