Changeset 43492 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Oct 1, 2012 12:25:02 PM (12 years ago)

Author:

vboxsync

Message:

Additions/crOpenGL: call stubInitXDamageExtension() earlier in fake DRI driver to avoid a Compiz hang.

File:

• trunk/src/VBox/Additions/common/crOpenGL/glx.c (modified) (4 diffs)

trunk/src/VBox/Additions/common/crOpenGL/glx.c

@@ -58 +58 @@
 
 static void stubXshmUpdateImageRect(Display *dpy, GLXDrawable draw, GLX_Pixmap_t *pGlxPixmap, XRectangle *pRect);
+static void stubInitXDamageExtension(ContextInfo *pContext);
 
 static void
@@ -624 +625 @@
     context->direct = direct;
 
+    /* This means that clients can't hold a server grab during
+     * glXCreateContext! */
+    stubInitXDamageExtension(context);
+
     return (GLXContext) context->id;
 }
@@ -2168 +2173 @@
 }
 
-static void stubInitXDamageExtension(ContextInfo *pContext)
+void stubInitXDamageExtension(ContextInfo *pContext)
 {
     int erb, vma, vmi;
@@ -2332 +2337 @@
     }
     XUNLOCK(dpy);
-
-    stubInitXDamageExtension(pContext);
 
     /* If there's damage extension, then get handle for damage events related to this pixmap */