Commit 67c303ff authored by Adam Jackson's avatar Adam Jackson 🥃

miinitext: Load GLX on the mi path

Add a stub for Xnest so it continues to link, but otherwise we support
GLX on every server so there's no need to make every DDX add it.
Signed-off-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
parent d8ec33fe
......@@ -536,9 +536,6 @@ static void dmxAddExtensions(void)
{
const ExtensionModule dmxExtensions[] = {
{ DMXExtensionInit, DMX_EXTENSION_NAME, NULL },
#ifdef GLXEXT
{ GlxExtensionInit, "GLX", &noGlxExtension },
#endif
};
LoadExtensionList(dmxExtensions, ARRAY_SIZE(dmxExtensions), TRUE);
......
......@@ -58,25 +58,9 @@ InitCard(char *name)
KdCardInfoAdd(&ephyrFuncs, 0);
}
static const ExtensionModule ephyrExtensions[] = {
#ifdef GLXEXT
{ GlxExtensionInit, "GLX", &noGlxExtension },
#endif
};
static
void ephyrExtensionInit(void)
{
LoadExtensionList(ephyrExtensions, ARRAY_SIZE(ephyrExtensions), TRUE);
}
void
InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
{
if (serverGeneration == 1)
ephyrExtensionInit();
KdInitOutput(pScreenInfo, argc, argv);
}
......
......@@ -957,27 +957,12 @@ vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
} /* end vfbScreenInit */
static const ExtensionModule vfbExtensions[] = {
#ifdef GLXEXT
{ GlxExtensionInit, "GLX", &noGlxExtension },
#endif
};
static
void vfbExtensionInit(void)
{
LoadExtensionList(vfbExtensions, ARRAY_SIZE(vfbExtensions), TRUE);
}
void
InitOutput(ScreenInfo * screen_info, int argc, char **argv)
{
int i;
int NumFormats = 0;
if (serverGeneration == 1)
vfbExtensionInit();
/* initialize pixmap formats */
/* must have a pixmap depth to match every screen depth */
......
......@@ -47,10 +47,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
static MODULESETUPPROTO(glxSetup);
static const ExtensionModule GLXExt[] = {
{ GlxExtensionInit, "GLX", &noGlxExtension },
};
static XF86ModuleVersionInfo VersRec = {
"glx",
MODULEVENDORSTRING,
......@@ -85,7 +81,5 @@ glxSetup(void *module, void *opts, int *errmaj, int *errmin)
GlxPushProvider(provider);
xorgGlxCreateVendor();
LoadExtensionList(GLXExt, ARRAY_SIZE(GLXExt), FALSE);
return module;
}
......@@ -47,6 +47,13 @@ is" without express or implied warranty.
Bool xnestDoFullGeneration = True;
#ifdef GLXEXT
void
GlxExtensionInit(void)
{
}
#endif
void
InitOutput(ScreenInfo * screen_info, int argc, char *argv[])
{
......
......@@ -149,25 +149,6 @@ QuartzSetupScreen(int index,
return TRUE;
}
static const ExtensionModule quartzExtensions[] = {
/* PseudoramiX needs to be done before RandR, so
* it is in miinitext.c until it can be reordered.
* { PseudoramiXExtensionInit, "PseudoramiX", &noPseudoramiXExtension },
*/
#ifdef GLXEXT
{GlxExtensionInit, "GLX", &noGlxExtension},
#endif
};
/*
* QuartzExtensionInit
* Initialises XQuartz-specific extensions.
*/
static void QuartzExtensionInit(void)
{
LoadExtensionList(quartzExtensions, ARRAY_SIZE(quartzExtensions), TRUE);
}
/*
* QuartzInitOutput
* Quartz display initialization.
......@@ -208,8 +189,6 @@ QuartzInitOutput(int argc,
// Do display mode specific initialization
quartzProcs->DisplayInit();
QuartzExtensionInit();
}
/*
......
......@@ -1067,9 +1067,6 @@ xwl_log_handler(const char *format, va_list args)
}
static const ExtensionModule xwayland_extensions[] = {
#ifdef GLXEXT
{ GlxExtensionInit, "GLX", &noGlxExtension },
#endif
#ifdef XF86VIDMODE
{ xwlVidModeExtensionInit, XF86VIDMODENAME, &noXFree86VidModeExtension },
#endif
......
......@@ -113,7 +113,6 @@ static PixmapFormatRec g_PixmapFormats[] = {
static const ExtensionModule xwinExtensions[] = {
#ifdef GLXEXT
{ GlxExtensionInit, "GLX", &noGlxExtension },
#ifdef XWIN_WINDOWS_DRI
{ WindowsDRIExtensionInit, "Windows-DRI", &noDriExtension },
#endif
......
......@@ -78,6 +78,7 @@ extern void GEExtensionInit(void);
#ifdef GLXEXT
extern _X_EXPORT Bool noGlxExtension;
extern void GlxExtensionInit(void);
#endif
#ifdef PANORAMIX
......
......@@ -27,9 +27,8 @@
#define GLX_EXT_INIT_H
/* this is separate due to sdksyms pulling in extinit.h */
/* XXX this comment no longer makes sense i think */
#ifdef GLXEXT
extern void GlxExtensionInit(void);
typedef struct __GLXprovider __GLXprovider;
typedef struct __GLXscreen __GLXscreen;
struct __GLXprovider {
......
......@@ -298,6 +298,9 @@ static const ExtensionModule staticExtensions[] = {
#ifdef XSELINUX
{SELinuxExtensionInit, "SELinux", &noSELinuxExtension},
#endif
#ifdef GLXEXT
{GlxExtensionInit, "GLX", &noGlxExtension},
#endif
};
static ExtensionModule *ExtensionModuleList = NULL;
......
......@@ -153,6 +153,10 @@ if !SPECIAL_DTRACE_OBJECTS
tests_LDADD += $(top_builddir)/os/libos.la
endif
if GLX
tests_LDADD += $(top_builddir)/glx/libglxvnd.la
endif
BUILT_SOURCES = sdksyms.c
CLEANFILES += sdksyms.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment