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

[Chris Wilson]

 src/sna/sna_dri2.c |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 0f1280bab9c99b15ba835a0094d8b849846d13f6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Aug 14 07:37:06 2014 +0100

    sna/dri2: Fix compilation with Xorg-1.12.4
    
    In Xorg-1.12.4 we have DRI2 version 6 (and so triple buffering support
    by Xorg) but we don't yet have Prime. Remove the check for the Prime bug
    in the Xserver for that case.
    
    Reported-by: Axel Rohde
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index 83c6040..a43627e 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -255,8 +255,13 @@ inline static void *dri2_window_get_front(WindowPtr win) { return NULL; }
 #else
 
 #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,904,0)
+/* Prime fixed for triple buffer support */
+#define xorg_can_triple_buffer(ptr) 1
+#elif XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,12,99,901,0)
+/* Before numGPUScreens was introduced */
 #define xorg_can_triple_buffer(ptr) 1
 #else
+/* Subject to crashers when combining triple buffering and Prime */
 inline static bool xorg_can_triple_buffer(struct sna *sna)
 {
 	return screenInfo.numGPUScreens == 0;