From 09d18b022f5e320ded6113c6ebfa273beff447ea Mon Sep 17 00:00:00 2001 From: alanh Date: Tue, 15 May 2001 20:40:17 +0000 Subject: merge in XFree86 CVS tdfx driver (to avoid problems later, there will be a compiler warning regarding the OptionsRec stuff - ignore it for now until the next merge). fix bug id #420071 where starting a XV application then gears would crash the server. fix the allocation of pixmapcache lines. We were grabbing 4095 or 2048 regardless of whether it was available and corrupted the back of the texture memory. fix maxClip to correct size when pixmap cache adjusted. Fix up driver ready for re-introduction of the texture/overlay XV support. --- xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.h') diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.h b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.h index 956b7e703..ecd402237 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.h +++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.h,v 1.5 2001/03/21 17:02:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.h,v 1.4 2001/03/03 22:41:34 tsi Exp $ */ #ifndef _TDFX_DRI_ #define _TDFX_DRI_ -- cgit v1.2.3