Applied Bruce Merry's patch fixing bug #206 (segfault on shutdown in the AMD/ATI...

[freeglut] / src / x11 / fg_init_x11.c

diff --git a/src/x11/fg_init_x11.c b/src/x11/fg_init_x11.c
index 49aefe6..52c5d88 100644 (file)
--- a/src/x11/fg_init_x11.c
+++ b/src/x11/fg_init_x11.c
@@ -182,6 +182,14 @@ void fgPlatformInitialize( const char* displayName )
     if( !glXQueryExtension( fgDisplay.pDisplay.Display, NULL, NULL ) )
         fgError( "OpenGL GLX extension not supported by display '%s'",
             XDisplayName( displayName ) );
+
+    /* This forces AMD Catalyst drivers to initialize and register a shutdown
+     * function, which must be done before our own call to atexit to prevent
+     * a crash if glutMainLoop is not called or is not exited cleanly.
+     * (see bug #206)
+     */
+    glXQueryExtensionsString( fgDisplay.pDisplay.Display,
+        DefaultScreen( fgDisplay.pDisplay.Display ));
 #endif
 
     fgDisplay.pDisplay.Screen = DefaultScreen( fgDisplay.pDisplay.Display );