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_texstate.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/mesa/drivers/dri/r300/r300_texstate.c') diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c index ccdf2a49b9..55d8254890 100644 --- a/src/mesa/drivers/dri/r300/r300_texstate.c +++ b/src/mesa/drivers/dri/r300/r300_texstate.c @@ -1302,7 +1302,10 @@ static GLboolean update_tex_common(GLcontext * ctx, int unit) } } +#if R200_MERGED FALLBACK(&rmesa->radeon, RADEON_FALLBACK_BORDER_MODE, t->border_fallback); +#endif + return !t->border_fallback; } @@ -1351,7 +1354,9 @@ void r300UpdateTextureState(GLcontext * ctx) r300UpdateTextureUnit(ctx, 7) ); +#if R200_MERGED FALLBACK(&rmesa->radeon, RADEON_FALLBACK_TEXTURE, !ok); +#endif /* This needs correction, or just be done elsewhere if (rmesa->radeon.TclFallback) -- cgit v1.2.3