From c043f97a8572e1f509251288d8bcd70d0fb96770 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 29 Nov 2013 11:25:56 +0100 Subject: fontconfig mesa xserver git update 29 Nov 2013 xserver commit d695cb7fb6bb8fd159a332d902673edbbd2237d7 fontconfig commit a5fd7912ff8c7bc72d2cdbd0038c7ff0c968831f mesa commit fb5f5b81883f360dcbbf407a0f6f5606bc0c0495 --- xorg-server/hw/dmx/dmxinit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'xorg-server/hw/dmx') diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c index bd868a092..7adcba0bb 100644 --- a/xorg-server/hw/dmx/dmxinit.c +++ b/xorg-server/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++) { -- cgit v1.2.3