xserver: Branch 'master' - 2 commits

[Ian Romanick]

 glx/glxdri2.c             |    8 ++++++++
 hw/xfree86/dri2/dri2ext.c |    4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 44227ef1b77467c76147b9bf79bdd0e6305a522a
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Mon Apr 20 18:20:52 2009 -0700

    DRI2: Send the version the code actually supports
    
    This prevents building an older server with a new dri2proto.h from
    resulting in a DRI2 extension module that lies about the version it
    supports.
    
    Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>

diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 503f827..23f3121 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -79,8 +79,8 @@ ProcDRI2QueryVersion(ClientPtr client)
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-    rep.majorVersion = DRI2_MAJOR;
-    rep.minorVersion = DRI2_MINOR;
+    rep.majorVersion = 1;
+    rep.minorVersion = 0;
 
     if (client->swapped) {
     	swaps(&rep.sequenceNumber, n);
commit d1e916d29be8b470cbc8cadcf6e83991fdbc5a9f
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Apr 16 12:10:34 2009 -0700

    DRI2: Add missing front-buffer flush callback.
    
    Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 9e452c4..612defb 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -443,9 +443,17 @@ dri2GetBuffers(__DRIdrawable *driDrawable,
     return private->buffers;
 }
 
+static void 
+dri2FlushFrontBuffer(__DRIdrawable *driDrawable, void *loaderPrivate)
+{
+    (void) driDrawable;
+    __glXDRIdrawableWaitGL((__GLXdrawable *) loaderPrivate);
+}
+
 static const __DRIdri2LoaderExtension loaderExtension = {
     { __DRI_DRI2_LOADER, __DRI_DRI2_LOADER_VERSION },
     dri2GetBuffers,
+    dri2FlushFrontBuffer,
 };
 
 static const __DRIextension *loader_extensions[] = {