From 6ffd0a4cf1aae2b5ea0fd683a2d7607e59cd3f68 Mon Sep 17 00:00:00 2001 From: Aapo Tahkola Date: Sun, 24 Apr 2005 09:08:31 +0000 Subject: Modifying to build against current Mesa. Disabled r200*.c files since they didnt want to build anymore. --- src/mesa/drivers/dri/r300/r300_context.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/mesa/drivers/dri/r300/r300_context.c') diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c index 143cd22eb2..856445acf1 100644 --- a/src/mesa/drivers/dri/r300/r300_context.c +++ b/src/mesa/drivers/dri/r300/r300_context.c @@ -109,7 +109,7 @@ static const struct tnl_pipeline_stage *r300_pipeline[] = { /* Try and go straight to t&l */ - &_r300_tcl_stage, + //&_r300_tcl_stage, /* Catch any t&l fallbacks */ @@ -293,7 +293,9 @@ GLboolean r300CreateContext(const __GLcontextModes * glVisual, tcl_mode = driQueryOptioni(&r300->radeon.optionCache, "tcl_mode"); if (driQueryOptionb(&r300->radeon.optionCache, "no_rast")) { fprintf(stderr, "disabling 3D acceleration\n"); +#if R200_MERGED FALLBACK(&r300->radeon, RADEON_FALLBACK_DISABLE, 1); +#endif } if (tcl_mode == DRI_CONF_TCL_SW || !(r300->radeon.radeonScreen->chipset & RADEON_CHIPSET_TCL)) { -- cgit v1.2.3