remove debug statements

8 files changed, 2 insertions, 59 deletions

diff --git a/src/mesa/tnl/t_array_api.c b/src/mesa/tnl/t_array_api.c
index 45e3f25d9bc..260a6fc5e09 100644
--- a/src/mesa/tnl/t_array_api.c
+++ b/src/mesa/tnl/t_array_api.c
@@ -87,7 +87,6 @@ static void _tnl_draw_range_elements( GLcontext *ctx, GLenum mode,
    int i;
    FLUSH_CURRENT( ctx, 0 );
    
-   /*  _mesa_debug(ctx, "%s\n", __FUNCTION__); */
    if (tnl->pipeline.build_state_changes)
       _tnl_validate_pipeline( ctx );
 
diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c
index 5ae0431a536..5e40309cd0d 100644
--- a/src/mesa/tnl/t_pipeline.c
+++ b/src/mesa/tnl/t_pipeline.c
@@ -125,8 +125,6 @@ void _tnl_run_pipeline( GLcontext *ctx )
    GLboolean running = GL_TRUE;
    unsigned short __tmp;
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__); 
-
    pipe->run_state_changes = 0;
    pipe->run_input_changes = 0;
 
diff --git a/src/mesa/tnl/t_save_playback.c b/src/mesa/tnl/t_save_playback.c
index deb404f483d..062fc4c1618 100644
--- a/src/mesa/tnl/t_save_playback.c
+++ b/src/mesa/tnl/t_save_playback.c
@@ -55,8 +55,6 @@ static void _tnl_bind_vertex_list( GLcontext *ctx,
    GLfloat *data = node->buffer;
    GLuint attr, i;
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__); 
-
    /* Setup constant data in the VB.
     */
    VB->Count = node->count;
@@ -125,9 +123,6 @@ void _tnl_playback_vertex_list( GLcontext *ctx, void *data )
    struct tnl_vertex_list *node = (struct tnl_vertex_list *)data;
    TNLcontext *tnl = TNL_CONTEXT(ctx);
 
-   _mesa_debug( 0, "%s %d prims %d verts\n", __FUNCTION__,
-		node->prim_count, node->count); 
-
    if (!node->prim_count || !node->count) 
       return;
 
diff --git a/src/mesa/tnl/t_vb_render.c b/src/mesa/tnl/t_vb_render.c
index 9010834e47a..cdec73b8a0d 100644
--- a/src/mesa/tnl/t_vb_render.c
+++ b/src/mesa/tnl/t_vb_render.c
@@ -314,7 +314,7 @@ static GLboolean run_render( GLcontext *ctx,
 
 	 assert((prim & PRIM_MODE_MASK) < GL_POLYGON+1);
 
-/* 	 if (MESA_VERBOSE & VERBOSE_PRIMS) */
+	 if (MESA_VERBOSE & VERBOSE_PRIMS) 
 	    _mesa_debug(NULL, "MESA prim %s %d..%d\n", 
 			_mesa_lookup_enum_by_nr(prim & PRIM_MODE_MASK), 
 			start, start+length);
diff --git a/src/mesa/tnl/t_vb_texgen.c b/src/mesa/tnl/t_vb_texgen.c
index 563bfb77a1c..e649e0f9b62 100644
--- a/src/mesa/tnl/t_vb_texgen.c
+++ b/src/mesa/tnl/t_vb_texgen.c
@@ -319,10 +319,6 @@ static void texgen_sphere_map( GLcontext *ctx,
    GLfloat (*f)[3] = store->tmp_f;
    GLfloat *m = store->tmp_m;
 
-/*     _mesa_debug(NULL, "%s normstride %d eyestride %d\n",  */
-/*  	   __FUNCTION__, VB->NormalPtr->stride, */
-/*  	   VB->EyePtr->stride); */
-
    (build_m_tab[VB->EyePtr->size])( store->tmp_f,
 				    store->tmp_m,
 				    VB->NormalPtr,
diff --git a/src/mesa/tnl/t_vtx_api.c b/src/mesa/tnl/t_vtx_api.c
index 253c8560f50..4252358563d 100644
--- a/src/mesa/tnl/t_vtx_api.c
+++ b/src/mesa/tnl/t_vtx_api.c
@@ -47,8 +47,6 @@ static void _tnl_wrap_buffers( GLcontext *ctx )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__); 
-
    if (ctx->Driver.CurrentExecPrimitive != GL_POLYGON+1) {
       GLint i = tnl->vtx.prim_count - 1;
       assert(i >= 0);
@@ -79,8 +77,6 @@ static void _tnl_wrap_filled_vertex( GLcontext *ctx )
    GLfloat *data = tnl->vtx.copied.buffer;
    int i;
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__); 
-
    /* Run pipeline on current vertices, copy wrapped vertices
     * to tnl->copied.
     */
@@ -105,8 +101,6 @@ static void _tnl_copy_to_current( GLcontext *ctx )
    TNLcontext *tnl = TNL_CONTEXT(ctx); 
    GLuint i;
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__); 
-
    for (i = _TNL_ATTRIB_POS+1 ; i <= _TNL_ATTRIB_INDEX ; i++) 
       if (tnl->vtx.attrsz[i]) {
 	 ASSIGN_4V( tnl->vtx.current[i], 0, 0, 0, 1 );
@@ -130,8 +124,6 @@ static void _tnl_copy_from_current( GLcontext *ctx )
    TNLcontext *tnl = TNL_CONTEXT(ctx); 
    GLint i;
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__); 
-
    for (i = _TNL_ATTRIB_POS+1 ; i <= _TNL_ATTRIB_INDEX ; i++) 
       switch (tnl->vtx.attrsz[i]) {
       case 4: tnl->vtx.attrptr[i][3] = tnl->vtx.current[i][3];
@@ -166,8 +158,6 @@ static void _tnl_wrap_upgrade_vertex( GLcontext *ctx,
    GLint i;
    GLfloat *tmp;
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__); 
-
 
    /* Run pipeline on current vertices, copy wrapped vertices
     * to tnl->vtx.copied.
@@ -250,8 +240,6 @@ static void _tnl_fixup_vertex( GLcontext *ctx, GLuint attr, GLuint sz )
    static float id[4] = { 0, 0, 0, 1 };
    int i;
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__); 
-
    if (tnl->vtx.attrsz[attr] < sz) {
       /* New size is larger.  Need to flush existing vertices and get
        * an enlarged vertex format.
@@ -284,8 +272,6 @@ static void do_choose( GLuint attr, GLuint sz,
    GET_CURRENT_CONTEXT( ctx ); 
    TNLcontext *tnl = TNL_CONTEXT(ctx); 
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__); 
-
    if (tnl->vtx.attrsz[attr] != sz)
       _tnl_fixup_vertex( ctx, attr, sz );
  
@@ -330,8 +316,6 @@ static void attrib_##ATTR##_##N( const GLfloat *v )	\
    GET_CURRENT_CONTEXT( ctx );				\
    TNLcontext *tnl = TNL_CONTEXT(ctx);			\
 							\
-   _mesa_debug( 0, "%s\n", __FUNCTION__);		\
-							\
    if ((ATTR) == 0) {					\
       int i;						\
 							\
@@ -360,8 +344,6 @@ static void attrib_##ATTR##_##N( const GLfloat *v )	\
 #define CHOOSE( ATTR, N )				\
 static void choose_##ATTR##_##N( const GLfloat *v )	\
 {							\
-   _mesa_debug( 0, "%s\n", __FUNCTION__);		\
-							\
    do_choose(ATTR, N,					\
 	     attrib_##ATTR##_##N,			\
 	     choose_##ATTR##_1,				\
@@ -374,8 +356,6 @@ static void choose_##ATTR##_##N( const GLfloat *v )	\
 #define INIT(ATTR)					\
 static void init_##ATTR( TNLcontext *tnl )		\
 {							\
-   _mesa_debug( 0, "%s\n", __FUNCTION__);		\
-							\
    tnl->vtx.tabfv[ATTR][0] = choose_##ATTR##_1;		\
    tnl->vtx.tabfv[ATTR][1] = choose_##ATTR##_2;		\
    tnl->vtx.tabfv[ATTR][2] = choose_##ATTR##_3; 	\
@@ -420,8 +400,6 @@ static void init_attrfv( TNLcontext *tnl )
 {
    GLuint i;
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__);
-						
    init_0( tnl );
    init_1( tnl );
    init_2( tnl );
@@ -859,8 +837,6 @@ static void _tnl_EvalCoord1f( GLfloat u )
    GET_CURRENT_CONTEXT( ctx );
    TNLcontext *tnl = TNL_CONTEXT(ctx);
 
-   _mesa_debug(0, "%s\n", __FUNCTION__);
-
    /* TODO: use a CHOOSE() function for this: */
    {
       GLint i;
@@ -889,8 +865,6 @@ static void _tnl_EvalCoord2f( GLfloat u, GLfloat v )
    GET_CURRENT_CONTEXT( ctx );
    TNLcontext *tnl = TNL_CONTEXT(ctx);
 
-   _mesa_debug(0, "%s\n", __FUNCTION__);
-
    /* TODO: use a CHOOSE() function for this: */
    {
       GLint i;
@@ -959,9 +933,6 @@ static void _tnl_Begin( GLenum mode )
 {
    GET_CURRENT_CONTEXT( ctx ); 
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__); 
-
-
    if (ctx->Driver.CurrentExecPrimitive == GL_POLYGON+1) {
       TNLcontext *tnl = TNL_CONTEXT(ctx); 
       int i;
@@ -988,8 +959,6 @@ static void _tnl_End( void )
 {
    GET_CURRENT_CONTEXT( ctx ); 
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__); 
-
    if (ctx->Driver.CurrentExecPrimitive != GL_POLYGON+1) {
       TNLcontext *tnl = TNL_CONTEXT(ctx); 
       int idx = tnl->vtx.initial_counter - tnl->vtx.counter;
@@ -1078,13 +1047,8 @@ void _tnl_FlushVertices( GLcontext *ctx, GLuint flags )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__); 
-
-
-   if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {
-      _mesa_debug( 0, "%s -- inside begin/end\n", __FUNCTION__); 
+   if (ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END)
       return;
-   }
 
    if (tnl->vtx.counter != tnl->vtx.initial_counter) {
       _tnl_flush_vtx( ctx );
diff --git a/src/mesa/tnl/t_vtx_eval.c b/src/mesa/tnl/t_vtx_eval.c
index 68b8a402646..5b5cb624c9a 100644
--- a/src/mesa/tnl/t_vtx_eval.c
+++ b/src/mesa/tnl/t_vtx_eval.c
@@ -66,8 +66,6 @@ void _tnl_update_eval( GLcontext *ctx )
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    GLuint attr;
 
-   _mesa_debug(0, "%s\n", __FUNCTION__);
-
    /* Vertex program maps have priority over conventional attribs */
 
    for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) {
diff --git a/src/mesa/tnl/t_vtx_exec.c b/src/mesa/tnl/t_vtx_exec.c
index 13129d74d35..376e580e3e0 100644
--- a/src/mesa/tnl/t_vtx_exec.c
+++ b/src/mesa/tnl/t_vtx_exec.c
@@ -88,9 +88,6 @@ static void _tnl_vb_bind_vtx( GLcontext *ctx )
    GLuint count = tnl->vtx.initial_counter - tnl->vtx.counter;
    GLuint attr, i;
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__); 
-
-
    /* Setup constant data in the VB.
     */
    VB->Count = count;
@@ -167,8 +164,6 @@ static GLuint _tnl_copy_vertices( GLcontext *ctx )
 		   tnl->vtx.prim[tnl->vtx.prim_count-1].start * 
 		   tnl->vtx.vertex_size);
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__); 
-
 
    switch( ctx->Driver.CurrentExecPrimitive )
    {
@@ -239,8 +234,6 @@ void _tnl_flush_vtx( GLcontext *ctx )
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
 
-   _mesa_debug( 0, "%s\n", __FUNCTION__); 
-
    if (tnl->vtx.prim_count && 
        tnl->vtx.counter != tnl->vtx.initial_counter) {