From 6d419feec75ab30fde2033db8d99b65da41cc4fe Mon Sep 17 00:00:00 2001 From: Vladimir Dergachev Date: Tue, 1 Feb 2005 15:46:23 +0000 Subject: [PATCH] Reduce noiseness of the driver. --- src/mesa/drivers/dri/r300/r300_context.h | 2 +- src/mesa/drivers/dri/r300/r300_ioctl.c | 2 +- src/mesa/drivers/dri/r300/r300_state.c | 4 ++-- src/mesa/drivers/dri/r300/r300_texstate.c | 2 ++ src/mesa/drivers/dri/r300/radeon_span.c | 2 ++ 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h index 8c8a8bfc71e..47b3c8374d9 100644 --- a/src/mesa/drivers/dri/r300/r300_context.h +++ b/src/mesa/drivers/dri/r300/r300_context.h @@ -59,7 +59,7 @@ typedef struct r300_context *r300ContextPtr; #define WARN_ONCE(a) { \ static int warn=1; \ if(warn){ \ - fprintf(stderr, (a)); \ + fprintf(stderr, "***WARN_ONCE*** " a); \ warn=0;\ } \ } diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c index b0222a129d7..ee5fb07fae0 100644 --- a/src/mesa/drivers/dri/r300/r300_ioctl.c +++ b/src/mesa/drivers/dri/r300/r300_ioctl.c @@ -69,7 +69,7 @@ static void r300ClearBuffer(r300ContextPtr r300, int flags, int buffer) drm_r300_cmd_header_t* cmd2; LOCAL_VARS; - if (1 || RADEON_DEBUG & DEBUG_IOCTL) + if (RADEON_DEBUG & DEBUG_IOCTL) fprintf(stderr, "%s: %s buffer (%i,%i %ix%i)\n", __FUNCTION__, buffer ? "back" : "front", dPriv->x, dPriv->y, dPriv->w, dPriv->h); diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index 3c7f0367b49..c75f2154e1a 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -1111,14 +1111,14 @@ void r300_setup_textures(GLcontext *ctx) for(i=0;iTexture.Unit[i].Enabled){ t=r300->state.texture.unit[i].texobj; - fprintf(stderr, "format=%08x\n", r300->state.texture.unit[i].format); + //fprintf(stderr, "format=%08x\n", r300->state.texture.unit[i].format); r300->state.texture.tc_count++; if(t==NULL){ fprintf(stderr, "Texture unit %d enabled, but corresponding texobj is NULL, using default object.\n", i); //exit(-1); t=&default_tex_obj; } - fprintf(stderr, "t->format=%08x\n", t->format); + //fprintf(stderr, "t->format=%08x\n", t->format); if (RADEON_DEBUG & DEBUG_STATE) fprintf(stderr, "Activating texture unit %d\n", i); max_texture_unit=i; diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c index 2351d7777e2..09864ccad8e 100644 --- a/src/mesa/drivers/dri/r300/r300_texstate.c +++ b/src/mesa/drivers/dri/r300/r300_texstate.c @@ -767,8 +767,10 @@ static GLboolean r300UpdateTextureEnv(GLcontext * ctx, int unit) */ } + #if 0 fprintf(stderr, "color_combine=%08x alpha_combine=%08x color_scale=%08x alpha_scale=%08x\n", color_combine, alpha_combine, color_scale, alpha_scale); + #endif #if 0 if (rmesa->hw.pix[unit].cmd[PIX_PP_TXCBLEND] != color_combine || diff --git a/src/mesa/drivers/dri/r300/radeon_span.c b/src/mesa/drivers/dri/r300/radeon_span.c index efc5a01c37b..5bb7f832e11 100644 --- a/src/mesa/drivers/dri/r300/radeon_span.c +++ b/src/mesa/drivers/dri/r300/radeon_span.c @@ -352,8 +352,10 @@ static void radeonSetBuffer(GLcontext * ctx, if (radeon->doPageFlip && radeon->sarea->pfCurrentPage == 1) buffer ^= 1; + #if 0 fprintf(stderr, "%s: using %s buffer\n", __FUNCTION__, buffer ? "back" : "front"); + #endif if (buffer) { radeon->state.pixel.readOffset = -- 2.30.2