From e2df3d01afaa6919b82962a087056f517bb94193 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michel=20D=C3=A4nzer?= Date: Sat, 28 Feb 2004 13:25:25 +0000 Subject: [PATCH] Only print message about disabling HW TCL if the chip supports it in the first place, and make the message a bit clearer. + Remove some extraneous whitespace. --- src/mesa/drivers/dri/r200/r200_context.c | 6 ++++-- src/mesa/drivers/dri/radeon/radeon_context.c | 10 ++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index 99765341d65..977dcf38d41 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -463,8 +463,10 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual, } else if (tcl_mode == DRI_CONF_TCL_SW || getenv("R200_NO_TCL") || !(rmesa->r200Screen->chipset & R200_CHIPSET_TCL)) { - rmesa->r200Screen->chipset &= ~R200_CHIPSET_TCL; - fprintf(stderr, "disabling TCL support\n"); + if (rmesa->r200Screen->chipset & R200_CHIPSET_TCL) { + rmesa->r200Screen->chipset &= ~R200_CHIPSET_TCL; + fprintf(stderr, "Disabling HW TCL support\n"); + } TCL_FALLBACK(rmesa->glCtx, R200_TCL_FALLBACK_TCL_DISABLE, 1); } if (rmesa->r200Screen->chipset & R200_CHIPSET_TCL) { diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index c68bab5f342..0424ffc84ab 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -440,12 +440,14 @@ radeonCreateContext( const __GLcontextModes *glVisual, tcl_mode = driQueryOptioni(&rmesa->optionCache, "tcl_mode"); if (driQueryOptionb(&rmesa->optionCache, "no_rast")) { fprintf(stderr, "disabling 3D acceleration\n"); - FALLBACK(rmesa, RADEON_FALLBACK_DISABLE, 1); + FALLBACK(rmesa, RADEON_FALLBACK_DISABLE, 1); } else if (tcl_mode == DRI_CONF_TCL_SW || !(rmesa->radeonScreen->chipset & RADEON_CHIPSET_TCL)) { - rmesa->radeonScreen->chipset &= ~RADEON_CHIPSET_TCL; - fprintf(stderr, "disabling TCL support\n"); - TCL_FALLBACK(rmesa->glCtx, RADEON_TCL_FALLBACK_TCL_DISABLE, 1); + if (rmesa->radeonScreen->chipset & RADEON_CHIPSET_TCL) { + rmesa->radeonScreen->chipset &= ~RADEON_CHIPSET_TCL; + fprintf(stderr, "Disabling HW TCL support\n"); + } + TCL_FALLBACK(rmesa->glCtx, RADEON_TCL_FALLBACK_TCL_DISABLE, 1); } if (rmesa->radeonScreen->chipset & RADEON_CHIPSET_TCL) { -- 2.30.2