svn merge ^/branches/released .

1 files changed, 6 insertions, 15 deletions

diff --git a/xorg-server/hw/xfree86/dri2/dri2ext.c b/xorg-server/hw/xfree86/dri2/dri2ext.c
index adbc9647b..6853fab9e 100644
--- a/xorg-server/hw/xfree86/dri2/dri2ext.c
+++ b/xorg-server/hw/xfree86/dri2/dri2ext.c
@@ -42,7 +42,6 @@
 #include "scrnintstr.h"

 #include "pixmapstr.h"

 #include "extnsionst.h"

-#include "xf86drm.h"

 #include "xfixes.h"

 #include "dri2.h"

 #include "protocol-versions.h"

@@ -56,7 +55,9 @@ static Bool
 validDrawable(ClientPtr client, XID drawable, Mask access_mode,

 	      DrawablePtr *pDrawable, int *status)

 {

-    *status = dixLookupDrawable(pDrawable, drawable, client, 0, access_mode);

+    *status = dixLookupDrawable(pDrawable, drawable, client,

+				M_DRAWABLE_WINDOW | M_DRAWABLE_PIXMAP,

+				access_mode);

     if (*status != Success) {

 	client->errorValue = drawable;

 	return FALSE;

@@ -521,9 +522,8 @@ static int
 ProcDRI2WaitSBC(ClientPtr client)

 {

     REQUEST(xDRI2WaitSBCReq);

-    xDRI2MSCReply rep;

     DrawablePtr pDrawable;

-    CARD64 target, ust, msc, sbc;

+    CARD64 target;

     int status;

 

     REQUEST_SIZE_MATCH(xDRI2WaitSBCReq);

@@ -533,18 +533,9 @@ ProcDRI2WaitSBC(ClientPtr client)
 	return status;

 

     target = vals_to_card64(stuff->target_sbc_lo, stuff->target_sbc_hi);

-    status = DRI2WaitSBC(client, pDrawable, target, &ust, &msc, &sbc);

-    if (status != Success)

-	return status;

+    status = DRI2WaitSBC(client, pDrawable, target);

 

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    load_msc_reply(&rep, ust, msc, sbc);

-

-    WriteToClient(client, sizeof(xDRI2MSCReply), &rep);

-

-    return Success;

+    return status;

 }

 

 static int