svn merge ^/branches/released .

1 files changed, 9 insertions, 4 deletions

diff --git a/xorg-server/hw/xfree86/dri2/dri2.h b/xorg-server/hw/xfree86/dri2/dri2.h
index c43aa6a04..afe2083de 100644
--- a/xorg-server/hw/xfree86/dri2/dri2.h
+++ b/xorg-server/hw/xfree86/dri2/dri2.h
@@ -66,6 +66,8 @@ typedef void		(*DRI2CopyRegionProcPtr)(DrawablePtr pDraw,
 						 DRI2BufferPtr pSrcBuffer);

 typedef void		(*DRI2WaitProcPtr)(WindowPtr pWin,

 					   unsigned int sequence);

+typedef int		(*DRI2AuthMagicProcPtr)(int fd, uint32_t magic);

+

 /**

  * Schedule a buffer swap

  *

@@ -159,7 +161,7 @@ typedef void		(*DRI2InvalidateProcPtr)(DrawablePtr pDraw,
 /**

  * Version of the DRI2InfoRec structure defined in this header

  */

-#define DRI2INFOREC_VERSION 4

+#define DRI2INFOREC_VERSION 5

 

 typedef struct {

     unsigned int version;	/**< Version of this struct */

@@ -183,6 +185,10 @@ typedef struct {
     /* array of driver names, indexed by DRI2Driver* driver types */

     /* a name of NULL means that driver is not supported */

     const char * const *driverNames;

+

+    /* added in version 5 */

+

+    DRI2AuthMagicProcPtr	AuthMagic;

 }  DRI2InfoRec, *DRI2InfoPtr;

 

 extern _X_EXPORT int DRI2EventBase;

@@ -200,7 +206,7 @@ extern _X_EXPORT Bool DRI2Connect(ScreenPtr pScreen,
 		 const char **driverName,

 		 const char **deviceName);

 

-extern _X_EXPORT Bool DRI2Authenticate(ScreenPtr pScreen, drm_magic_t magic);

+extern _X_EXPORT Bool DRI2Authenticate(ScreenPtr pScreen, uint32_t magic);

 

 extern _X_EXPORT int DRI2CreateDrawable(ClientPtr client,

 					DrawablePtr pDraw,

@@ -259,8 +265,7 @@ extern _X_EXPORT int DRI2WaitMSC(ClientPtr client, DrawablePtr pDrawable,
 extern _X_EXPORT int ProcDRI2WaitMSCReply(ClientPtr client, CARD64 ust,

 					  CARD64 msc, CARD64 sbc);

 extern _X_EXPORT int DRI2WaitSBC(ClientPtr client, DrawablePtr pDraw,

-				 CARD64 target_sbc, CARD64 *ust, CARD64 *msc,

-				 CARD64 *sbc);

+				 CARD64 target_sbc);

 extern _X_EXPORT Bool DRI2ThrottleClient(ClientPtr client, DrawablePtr pDraw);

 

 extern _X_EXPORT Bool DRI2CanFlip(DrawablePtr pDraw);