Revision: 322 http://trac.macosforge.org/projects/xquartz/changeset/322 Author: gstaplin@apple.com Date: 2009-03-20 17:36:03 -0700 (Fri, 20 Mar 2009) Log Message: ----------- Reorder some code so that each display connection gets initialized. Modified Paths: -------------- AppleSGLX/trunk/apple_glx.c Modified: AppleSGLX/trunk/apple_glx.c =================================================================== --- AppleSGLX/trunk/apple_glx.c 2009-03-20 22:37:15 UTC (rev 321) +++ AppleSGLX/trunk/apple_glx.c 2009-03-21 00:36:03 UTC (rev 322) @@ -112,6 +112,12 @@ int eventBase, errorBase; int major, minor, patch; + if(!XAppleDRIQueryExtension(dpy, &eventBase, &errorBase)) + return true; + + if(!XAppleDRIQueryVersion(dpy, &major, &minor, &patch)) + return true; + if(initialized) return false; @@ -125,14 +131,9 @@ libgl_handle = dlopen(OPENGL_LIB_PATH, RTLD_LAZY); (void)apple_glx_get_client_id(); - if(!XAppleDRIQueryExtension(dpy, &eventBase, &errorBase)) - return true; - - if(!XAppleDRIQueryVersion(dpy, &major, &minor, &patch)) - return true; - XAppleDRISetSurfaceNotifyHandler(surface_notify_handler); + /* This should really be per display. */ dri_event_base = eventBase; initialized = true;