diff options
Diffstat (limited to 'unix/xserver/hw/vnc/xvnc.c')
| -rw-r--r-- | unix/xserver/hw/vnc/xvnc.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/unix/xserver/hw/vnc/xvnc.c b/unix/xserver/hw/vnc/xvnc.c index 6065cc49..4ee1cd1b 100644 --- a/unix/xserver/hw/vnc/xvnc.c +++ b/unix/xserver/hw/vnc/xvnc.c @@ -1,6 +1,6 @@ /* Copyright (c) 1993 X Consortium Copyright (C) 2002-2005 RealVNC Ltd. All Rights Reserved. - Copyright 2009-2015 Pierre Ossman for Cendio AB + Copyright 2009-2024 Pierre Ossman for Cendio AB Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -1106,14 +1106,17 @@ vncClientStateChange(CallbackListPtr *a, void *b, void *c) #ifdef GLXEXT #if XORG_OLDER_THAN(1, 20, 0) extern void GlxExtensionInit(void); +#endif +#endif -static ExtensionModule glxExt = { - GlxExtensionInit, - "GLX", - &noGlxExtension -}; +static const ExtensionModule vncExtensions[] = { + {vncExtensionInit, "VNC-EXTENSION", NULL}, +#ifdef GLXEXT +#if XORG_OLDER_THAN(1, 20, 0) + { GlxExtensionInit, "GLX", &noGlxExtension }, #endif #endif +}; void InitOutput(ScreenInfo * scrInfo, int argc, char **argv) @@ -1123,15 +1126,11 @@ InitOutput(ScreenInfo * scrInfo, int argc, char **argv) vncPrintBanner(); -#if XORG_AT_LEAST(1, 20, 0) - xorgGlxCreateVendor(); -#else - -#ifdef GLXEXT if (serverGeneration == 1) - LoadExtensionList(&glxExt, 1, TRUE); -#endif + LoadExtensionList(vncExtensions, ARRAY_SIZE(vncExtensions), TRUE); +#if XORG_AT_LEAST(1, 20, 0) + xorgGlxCreateVendor(); #endif /* initialize pixmap formats */ |