Disable the {Open,Close}FullScreen DRI protocol.

Remove empty FullScreen stubs from drivers, comment the non-empty ones.

2 files changed, 0 insertions, 39 deletions

diff --git a/src/i810_dri.c b/src/i810_dri.c
index 635395db..6ffe916d 100644
--- a/src/i810_dri.c
+++ b/src/i810_dri.c
@@ -52,8 +52,6 @@ static void I810DRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
 			       RegionPtr prgnSrc, CARD32 index);
 
 
-static Bool I810DRIOpenFullScreen(ScreenPtr pScreen);
-static Bool I810DRICloseFullScreen(ScreenPtr pScreen);
 static void I810EnablePageFlip(ScreenPtr pScreen);
 static void I810DisablePageFlip(ScreenPtr pScreen);
 static void I810DRITransitionSingleToMulti3d(ScreenPtr pScreen);
@@ -398,8 +396,6 @@ I810DRIScreenInit(ScreenPtr pScreen)
    pDRIInfo->InitBuffers = I810DRIInitBuffers;
    pDRIInfo->MoveBuffers = I810DRIMoveBuffers;
    pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
-   pDRIInfo->OpenFullScreen = I810DRIOpenFullScreen;
-   pDRIInfo->CloseFullScreen = I810DRICloseFullScreen;
    pDRIInfo->TransitionTo2d = I810DRITransitionTo2d;
    pDRIInfo->TransitionTo3d = I810DRITransitionTo3d;
    pDRIInfo->TransitionSingleToMulti3D = I810DRITransitionSingleToMulti3d;
@@ -1327,19 +1323,6 @@ I810DRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
 }
 
 
-/* Fullscreen hooks.  The DRI fullscreen mode can probably be removed as
- * it adds little or nothing above the mechanism below (and isn't widely
- * used).
- */
-static Bool I810DRIOpenFullScreen(ScreenPtr pScreen)
-{
-    return TRUE;
-}
-
-static Bool I810DRICloseFullScreen(ScreenPtr pScreen)
-{
-    return TRUE;
-}
 /* Use the miext/shadow module to maintain a list of dirty rectangles.
  * These are blitted to the back buffer to keep both buffers clean
  * during page-flipping when the 3d application isn't fullscreen.
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 87b6a335..1843aaf0 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -96,8 +96,6 @@ static void I830DRIInitBuffers(WindowPtr pWin, RegionPtr prgn, CARD32 index);
 static void I830DRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
 			       RegionPtr prgnSrc, CARD32 index);
 
-static Bool I830DRICloseFullScreen(ScreenPtr pScreen);
-static Bool I830DRIOpenFullScreen(ScreenPtr pScreen);
 static void I830DRITransitionTo2d(ScreenPtr pScreen);
 static void I830DRITransitionTo3d(ScreenPtr pScreen);
 static void I830DRITransitionMultiToSingle3d(ScreenPtr pScreen);
@@ -516,8 +514,6 @@ I830DRIScreenInit(ScreenPtr pScreen)
    pDRIInfo->InitBuffers = I830DRIInitBuffers;
    pDRIInfo->MoveBuffers = I830DRIMoveBuffers;
    pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
-   pDRIInfo->OpenFullScreen = I830DRIOpenFullScreen;
-   pDRIInfo->CloseFullScreen = I830DRICloseFullScreen;
    pDRIInfo->TransitionTo2d = I830DRITransitionTo2d;
    pDRIInfo->TransitionTo3d = I830DRITransitionTo3d;
    pDRIInfo->TransitionSingleToMulti3D = I830DRITransitionSingleToMulti3d;
@@ -1134,24 +1130,6 @@ I830EmitInvarientState(ScrnInfoPtr pScrn)
    }
 }
 
-/* Fullscreen hooks.  The DRI fullscreen mode can probably be removed
- * as it adds little or nothing above the mechanism below.  (and isn't
- * widely used)
- */
-static Bool
-I830DRIOpenFullScreen(ScreenPtr pScreen)
-{
-  return TRUE;
-}
-
-static Bool
-I830DRICloseFullScreen(ScreenPtr pScreen)
-{
-  return TRUE;
-}
-
-
-
 /* Use callbacks from dri.c to support pageflipping mode for a single
  * 3d context without need for any specific full-screen extension.
  *