xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/dri2/dri2ext.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4b55b2cf8a52c39b53bae11cd1bc7314481d4c86
Author: Robert Bragg <bob at o-hand.com>
Date:   Wed Jan 27 20:38:38 2010 +0000

    DRI2: initialize event->drawable in DRI2SwapEvent
    
    We weren't initialising the drawable in the event structure so the
    client side DRI2WireToEvent used for translating the event into a GLX
    event wouldn't be able to lookup up the corresponding GLXDrawable before
    passing the event on.
    
    Signed-off-by: Robert Bragg <robert at linux.intel.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 3e6b03e..bd92fd3 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -353,10 +353,12 @@ DRI2SwapEvent(ClientPtr client, void *data, int type, CARD64 ust, CARD64 msc,
 	      CARD64 sbc)
 {
     xDRI2BufferSwapComplete event;
+    DrawablePtr pDrawable = data;
 
     event.type = DRI2EventBase + DRI2_BufferSwapComplete;
     event.sequenceNumber = client->sequence;
     event.event_type = type;
+    event.drawable = pDrawable->id;
     event.ust_hi = (CARD64)ust >> 32;
     event.ust_lo = ust & 0xffffffff;
     event.msc_hi = (CARD64)msc >> 32;