xserver: Branch 'master'

[Keith Packard]

 hw/dmx/dmxinit.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d695cb7fb6bb8fd159a332d902673edbbd2237d7
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Nov 25 22:19:34 2013 -0800

    Xdmx: Initialize DMX extension even if not built with GLX support
    
    dmxAddExtensions takes an argument to determine if it should just
    initialize the DMX extension, or both DMX & GLX, but if GLX wasn't
    compiled in, the entire call was #ifdef'ed out, leaving the DMX
    extension unavailable.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Julien Cristau <jcristau at debian.org>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c
index bd868a0..7adcba0 100644
--- a/hw/dmx/dmxinit.c
+++ b/hw/dmx/dmxinit.c
@@ -612,6 +612,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
 
 #ifdef GLXEXT
     static Bool glxSupported = TRUE;
+#else
+    const Bool glxSupported = FALSE;
 #endif
 
     if (dmxGeneration != serverGeneration) {
@@ -740,10 +742,10 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
     /* Check if GLX extension exists on all back-end servers */
     for (i = 0; i < dmxNumScreens; i++)
         glxSupported &= (dmxScreens[i].glxMajorOpcode > 0);
+#endif
 
     if (serverGeneration == 1)
         dmxAddExtensions(glxSupported);
-#endif
 
     /* Tell dix layer about the backend displays */
     for (i = 0; i < dmxNumScreens; i++) {