Changeset 3729 in vbox for trunk/src/VBox/HostServices

Timestamp:

Jul 20, 2007 10:11:37 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

23033

Message:

Update from Alexander Eichner.

File:

• trunk/src/VBox/HostServices/SharedOpenGL/gllindrv.cpp (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/gllindrv.cpp

@@ -42 +42 @@
     return (XIO_handler(d));
 }*/
+
+/* X11 server connection for all OpenGL clients.
+ * Neccessary because Mesa and DRI cannot handle more than one
+ * connection per thread (only hardware acceleration, software rendering
+ * runs fine with more than one connection). 
+ * Would crash in vboxglDisconnect if on every vboxglConnect
+ * a new Display is created */
+Display *glXDisplay = NULL;
 
 static Bool WaitForNotify( Display *dpy, XEvent *event, XPointer arg ) {
@@ -158 +166 @@
     Log(("vboxglGlobalInit\n"));
 
+    glXDisplay = XOpenDisplay(NULL);
+
     /*vboxInitOpenGLExtensions();*/
     return VINF_SUCCESS;
@@ -252 +262 @@
     pClient->xWindow = 0;
 
-    pClient->dpy = XOpenDisplay(NULL);
+    pClient->dpy = glXDisplay;
 
     if (pClient->dpy) {
@@ -298 +308 @@
 
 #ifdef VBOX_OGL_DEBUG_WINDOW_OUTPUT
-    if (pClient->dpy) {
-        if (pClient->xWindow != 0) {
-            XUnmapWindow(pClient->dpy, pClient->xWindow);
-            XDestroyWindow(pClient->dpy, pClient->xWindow);
-        }
-        if (pClient->PixelFormatToFBConfigMapper) {
-            XFree(pClient->PixelFormatToFBConfigMapper);
-        }
-        XCloseDisplay(pClient->dpy);
-    }
+    if (pClient->xWindow != 0) {
+        XUnmapWindow(pClient->dpy, pClient->xWindow);
+        XDestroyWindow(pClient->dpy, pClient->xWindow);
+    }
+    if (pClient->PixelFormatToFBConfigMapper) {
+        XFree(pClient->PixelFormatToFBConfigMapper);
+    }
+
     pClient->dpy = NULL;
     pClient->xWindow = 0;