diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-11-25 22:19:34 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-11-26 22:39:01 -0800 |
| commit | d695cb7fb6bb8fd159a332d902673edbbd2237d7 (patch) | |
| tree | 9be14ec0ee5cd49026fc28f84877f7a29fb20edf | |
| parent | bd70def07754357d26b86c287037eb3884631daf (diff) | |
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@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | hw/dmx/dmxinit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c index bd868a092..7adcba0bb 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++) { |