summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/r300/r300_context.c
diff options
context:
space:
mode:
authorAapo Tahkola <aet@rasterburn.org>2005-04-24 09:08:31 +0000
committerAapo Tahkola <aet@rasterburn.org>2005-04-24 09:08:31 +0000
commit6ffd0a4cf1aae2b5ea0fd683a2d7607e59cd3f68 (patch)
tree39fa877aeee98f7e14598c67269c39a7293761a3 /src/mesa/drivers/dri/r300/r300_context.c
parent5c906924ed6ee664ba61764dd21bee36dce06d02 (diff)
Modifying to build against current Mesa. Disabled r200*.c files since they didnt want to build anymore.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_context.c')
-rw-r--r--src/mesa/drivers/dri/r300/r300_context.c4
1 files changed, 3 insertions, 1 deletions
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)) {