dmx: Use noGlxExtension like other DDXes

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2017-09-13 15:44:15 -04:00
parent fd0eafb184
commit c57f63829f
2 changed files with 7 additions and 11 deletions

View File

@ -532,12 +532,12 @@ dmxDisplayInit(DMXScreenInfo * dmxScreen)
dmxGetPixmapFormats(dmxScreen);
}
static void dmxAddExtensions(Bool glxSupported)
static void dmxAddExtensions(void)
{
const ExtensionModule dmxExtensions[] = {
{ DMXExtensionInit, DMX_EXTENSION_NAME, NULL },
#ifdef GLXEXT
{ GlxExtensionInit, "GLX", &glxSupported },
{ GlxExtensionInit, "GLX", &noGlxExtension },
#endif
};
@ -551,12 +551,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
int i;
static unsigned long dmxGeneration = 0;
#ifdef GLXEXT
static Bool glxSupported = TRUE;
#else
const Bool glxSupported = FALSE;
#endif
if (dmxGeneration != serverGeneration) {
int vendrel = VENDOR_RELEASE;
int major, minor, year, month, day;
@ -676,17 +670,17 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
#ifdef GLXEXT
/* Check if GLX extension exists on all back-end servers */
for (i = 0; i < dmxNumScreens; i++)
glxSupported &= (dmxScreens[i].glxMajorOpcode > 0);
noGlxExtension |= (dmxScreens[i].glxMajorOpcode == 0);
#endif
if (serverGeneration == 1)
dmxAddExtensions(glxSupported);
dmxAddExtensions();
/* Tell dix layer about the backend displays */
for (i = 0; i < dmxNumScreens; i++) {
#ifdef GLXEXT
if (glxSupported) {
if (!noGlxExtension) {
/*
* Builds GLX configurations from the list of visuals
* supported by the back-end server, and give that

View File

@ -47,6 +47,8 @@
#include "extinit.h"
#include "glx_extinit.h"
int noGlxExtension;
/*
** Forward declarations.
*/