Update for glamor in the 1.16 server.

v2: Rebase on master, add missing return value.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/uxa/intel_dri3.c b/src/uxa/intel_dri3.c
index dc8d7621..6b50d77c 100644
--- a/src/uxa/intel_dri3.c
+++ b/src/uxa/intel_dri3.c
@@ -30,6 +30,7 @@
 
 #include "intel.h"
 #include "dri3.h"
+#include "uxa.h"
 
 static int
 intel_dri3_open(ScreenPtr screen,
@@ -136,5 +137,12 @@ static dri3_screen_info_rec intel_dri3_screen_info = {
 Bool
 intel_dri3_screen_init(ScreenPtr screen)
 {
+	ScrnInfoPtr             scrn = xf86ScreenToScrn(screen);
+	intel_screen_private    *intel = intel_get_screen_private(scrn);
+
+        /* glamor handles DRI3 on its own. */
+        if (intel->uxa_flags & UXA_USE_GLAMOR)
+                return TRUE;
+
         return dri3_screen_init(screen, &intel_dri3_screen_info);
 }