Remove wrapping code until we're really ready to deploy it.

1 files changed, 0 insertions, 39 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
index 4faad2c14..c22791520 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
@@ -140,45 +140,6 @@ TDFXInitVisualConfigs(ScreenPtr pScreen)
   return TRUE;
 }
 
-/* Right now these (Wakeup/Block)Handlers are the standard DRI
-   versions. Eventually move locking down into the acceleration functions */
-static void TDFXDoWakeupHandler(int screenNum, pointer wakeupData, 
-				unsigned long result, pointer pReadmask)
-{
-  ScreenPtr pScreen = screenInfo.screens[screenNum];
-  DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-
-  DRILock(pScreen, 0);
-  if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {
-    /* hide X context by swapping 2D component here */
-    (*pDRIPriv->pDriverInfo->SwapContext)(pScreen,
-					  DRI_3D_SYNC,
-					  DRI_2D_CONTEXT,
-					  pDRIPriv->partial3DContextStore,
-					  DRI_2D_CONTEXT,
-					  pDRIPriv->hiddenContextStore);
-  }
-}
-
-static TDFXDoBlockHandler(int screenNum, pointer blockData, pointer pTimeout,
-			  pointer pReadmask)
-{
-  ScreenPtr pScreen = screenInfo.screens[screenNum];
-  DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-
-  if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {
-    /* hide X context by swapping 2D component here */
-    (*pDRIPriv->pDriverInfo->SwapContext)(pScreen,
-					  DRI_2D_SYNC,
-					  DRI_NO_CONTEXT,
-					  NULL,
-					  DRI_2D_CONTEXT,
-					  pDRIPriv->partial3DContextStore);
-  }
-  DRIUnlock(pScreen);
-}
-
-
 Bool TDFXDRIScreenInit(ScreenPtr pScreen)
 {
   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];