From: Michel Dänzer <michel@daenzer.net>
Date: Sun, 11 Jan 2004 13:10:08 +0000 (+0000)
Subject: Actually disable HW TCL capability when SW TCL is forced.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4dd4ac3fc0241910ecc8331659db09bf68399a60;p=mesa.git

Actually disable HW TCL capability when SW TCL is forced.

+ remove some gratuitous whitespace
---

diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index af58c50b52c..59e32b2ba8b 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -436,12 +436,13 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual,
    tcl_mode = driQueryOptioni(&rmesa->optionCache, "tcl_mode");
    if (driQueryOptionb(&rmesa->optionCache, "no_rast")) {
       fprintf(stderr, "disabling 3D acceleration\n");
-      FALLBACK(rmesa, R200_FALLBACK_DISABLE, 1); 
+      FALLBACK(rmesa, R200_FALLBACK_DISABLE, 1);
    }
    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");
-      TCL_FALLBACK(rmesa->glCtx, R200_TCL_FALLBACK_TCL_DISABLE, 1); 
+      TCL_FALLBACK(rmesa->glCtx, R200_TCL_FALLBACK_TCL_DISABLE, 1);
    }
    if (rmesa->r200Screen->chipset & R200_CHIPSET_TCL) {
       if (tcl_mode >= DRI_CONF_TCL_VTXFMT && !getenv("R200_NO_VTXFMT")) {