From d61ae18074e53c2cdfb13cc37693b526160d6ca7 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 4 Mar 2015 12:16:29 +0000
Subject: [PATCH] glx/dri2: Disable AIGLX if indirect GLX is disabled

There is no point in setting up the acceleration for indirect GLX if
indirect GLX is itself disabled.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 glx/glxdri2.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index bcd57a4a3..c0f29ea31 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -936,6 +936,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
     size_t buffer_size;
     ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
 
+    if (!enableIndirectGLX)
+	    return NULL;
+
     screen = calloc(1, sizeof *screen);
     if (screen == NULL)
         return NULL;