xserver: Branch 'master'

[Keith Packard]

 glx/glxdri2.c |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit bf6344e1913a5d24c2d68eaca999ea3d71e1b707
Author: Keith Packard <keithp at keithp.com>
Date:   Thu May 14 14:58:29 2015 -0700

    Revert "glx/dri2: Disable AIGLX if indirect GLX is disabled"
    
    This reverts commit d61ae18074e53c2cdfb13cc37693b526160d6ca7.
    
    If the DRI2 provider is disabled, then we don't advertise the correct
    GLX extensions to clients, and things like GLES fail.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90442
    Reviewed-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index c0f29ea..bcd57a4 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -936,9 +936,6 @@ __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;