[PATCH 2/2] Revert "Revert "glx/dri2: Disable AIGLX if indirect GLX is disabled""

[Adam Jackson]

The previous fix to enable GLX extensions in the swrast path means that
now we'll get GLX_ARB_create_context and friends enabled (assuming you
have a swrast driver installed, which you ought to).

This reverts commit bf6344e1913a5d24c2d68eaca999ea3d71e1b707.

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 glx/glxdri2.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index bcd57a4..c0f29ea 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;
-- 
2.4.0