xf86-video-intel: src/sna/sna_dri.c

[Chris Wilson]

 src/sna/sna_dri.c |   27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 61764af13aa3c770d19d51c8ad198cab8a5866f1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Sep 22 12:59:32 2011 +0100

    sna/dri: Bump DRI2INFOREC_VERSION
    
    An intervening dri2 patch landed in the sever.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index 5bb1044..82cec08 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -1738,19 +1738,24 @@ Bool sna_dri_open(struct sna *sna, ScreenPtr screen)
 
 	info.CopyRegion = sna_dri_copy_region;
 #if DRI2INFOREC_VERSION >= 4
-	{
-	    info.version = 4;
-	    info.ScheduleSwap = sna_dri_schedule_swap;
-	    info.GetMSC = sna_dri_get_msc;
-	    info.ScheduleWaitMSC = sna_dri_schedule_wait_msc;
-	    info.numDrivers = 1;
-	    info.driverNames = driverNames;
-	    driverNames[0] = info.driverName;
+	info.version = 4;
+	info.ScheduleSwap = sna_dri_schedule_swap;
+	info.GetMSC = sna_dri_get_msc;
+	info.ScheduleWaitMSC = sna_dri_schedule_wait_msc;
+	info.numDrivers = 1;
+	info.driverNames = driverNames;
+	driverNames[0] = info.driverName;
+#endif
+
 #if DRI2INFOREC_VERSION >= 6
-	    info.version = 6;
-	    info.AsyncSwap = sna_dri_async_swap;
+	info.version = 6;
+	info.SwapLimitValidate = NULL;
+	info.ReuseBufferNotify = NULL;
 #endif
-	}
+
+#if DRI2INFOREC_VERSION >= 7
+	info.version = 7;
+	info.AsyncSwap = sna_dri_async_swap;
 #endif
 
 	return DRI2ScreenInit(screen, &info);