andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Xdmx: Initialize DMX extension even if not built with GLX support

Browse Source 
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>
This commit is contained in:
Alan Coopersmith 2013-11-25 22:19:34 -08:00 committed by Keith Packard
parent bd70def077
commit d695cb7fb6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/dmx/dmxinit.c
View File

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