xserver: Branch 'master' - 2 commits

[Kristian Høgsberg]

 configure.ac              |    2 +-
 hw/xfree86/dri2/dri2.c    |   24 ------------------------
 hw/xfree86/dri2/dri2ext.c |    5 -----
 3 files changed, 1 insertion(+), 30 deletions(-)

New commits:
commit afeacb8e74b2a1e366e5ca9f0e58805d8d96c457
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Mon Dec 1 20:53:17 2008 -0500

    Bump dri2proto requirement to 1.99.3.

diff --git a/configure.ac b/configure.ac
index 9beeca1..989d0ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -858,7 +858,7 @@ if test "x$DRI" = xyes; then
 	AC_SUBST(GL_CFLAGS)
 fi
 
-PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= 1.99.1],
+PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= 1.99.3],
                   [HAVE_DRI2PROTO=yes], [HAVE_DRI2PROTO=no])
 case "$DRI2,$HAVE_DRI2PROTO" in
 	yes,no)
commit ad01e86b5c7c528adec8a1f95ecaa294f58a8922
Author: Kristian Høgsberg <krh at redhat.com>
Date:   Mon Dec 1 20:52:41 2008 -0500

    Drop unused DRI2 vblank infrastructure.
    
    For this first iteration of DRI2 we don't have any vsync functionality
    in place yet, so back out the support in DRI2 and the protocol for now.

diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 64132a7..de94daa 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -66,9 +66,7 @@ typedef struct _DRI2Screen {
     DRI2CreateBuffersProcPtr	 CreateBuffers;
     DRI2DestroyBuffersProcPtr	 DestroyBuffers;
     DRI2CopyRegionProcPtr	 CopyRegion;
-    DRI2WaitProcPtr		 Wait;
 
-    ClipNotifyProcPtr            ClipNotify;
     HandleExposuresProcPtr       HandleExposures;
 } DRI2ScreenRec, *DRI2ScreenPtr;
 
@@ -251,23 +249,6 @@ DRI2Authenticate(ScreenPtr pScreen, drm_magic_t magic)
     return TRUE;
 }
 
-static void
-DRI2ClipNotify(WindowPtr pWin, int dx, int dy)
-{
-    ScreenPtr           pScreen = pWin->drawable.pScreen;
-    DRI2ScreenPtr       ds = DRI2GetScreen(pScreen);
-    DRI2DrawablePtr     dd = DRI2GetDrawable(&pWin->drawable);
-
-    if (dd && ds->lastSequence < dd->pendingSequence && ds->Wait)
-	ds->Wait(pWin, dd->pendingSequence);
-
-    if (ds->ClipNotify) {
-	pScreen->ClipNotify = ds->ClipNotify;
-	pScreen->ClipNotify(pWin, dx, dy);
-	pScreen->ClipNotify = DRI2ClipNotify;
-    }
-}
-
 _X_EXPORT Bool
 DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
 {
@@ -283,10 +264,6 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
     ds->CreateBuffers  = info->CreateBuffers;
     ds->DestroyBuffers = info->DestroyBuffers;
     ds->CopyRegion     = info->CopyRegion;
-    ds->Wait           = info->Wait;
-
-    ds->ClipNotify              = pScreen->ClipNotify;
-    pScreen->ClipNotify         = DRI2ClipNotify;
 
     dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, ds);
 
@@ -300,7 +277,6 @@ DRI2CloseScreen(ScreenPtr pScreen)
 {
     DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
 
-    pScreen->ClipNotify = ds->ClipNotify;
     xfree(ds);
     dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, NULL);
 }
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 595df73..0a1dce4 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -243,10 +243,6 @@ ProcDRI2CopyRegion(ClientPtr client)
 
     REQUEST_SIZE_MATCH(xDRI2CopyRegionReq);
 
-    /* No optional values supported for DRI2 2.0 protocol. */
-    if (stuff->bitmask != 0)
-	    return BadValue;
-
     if (!validDrawable(client, stuff->drawable, &pDrawable, &status))
 	return status;
 
@@ -266,7 +262,6 @@ ProcDRI2CopyRegion(ClientPtr client)
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-    rep.bitmask = 0;
 
     WriteToClient(client, sizeof(xDRI2CopyRegionReply), &rep);