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

hw/xwin: Only add GLX extension once.

Browse Source 
Using of LoadExtension() to add GLX onto to the end of the list of extensions on
every server regeneration leads to hilarious consequences (i.e. crashing) after
the first regeneration :-)

Possibly xf86ExtensionInit() and QuartzExtensionInit() need a similar fix.

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
Tested-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2012-09-02 15:17:05 +01:00
parent 7ceb854812
commit 25741b1aa3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xwin/InitOutput.c
View File

@ -164,7 +164,7 @@ void XwinExtensionInit(void)
int i;
#ifdef XWIN_GLX_WINDOWS
if ((g_fNativeGl) && (serverGeneration == 1)) {
if (g_fNativeGl) {
/* install the native GL provider */
glxWinPushNativeProvider();
}
@ -901,7 +901,8 @@ InitOutput(ScreenInfo * screenInfo, int argc, char *argv[])
{
int i;
XwinExtensionInit();
if (serverGeneration == 1)
XwinExtensionInit();
/* Log the command line */
winLogCommandLine(argc, argv);