Changeset 34133 in vbox for trunk/src/VBox/Additions

Timestamp:

Nov 17, 2010 9:24:06 AM (14 years ago)

Author:

vboxsync

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

67851

Message:

crOpenGL: add workaround for glut based apps on linux

File:

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

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

@@ -13 +13 @@
 #include "stub.h"
 #include "dri_glx.h"
+#include "GL/internal/glcore.h"
 
 #include <X11/Xregion.h>
@@ -1830 +1831 @@
     }
     */
-
     {
         XVisualInfo temp, *pret;
@@ -1840 +1840 @@
         XUNLOCK(dpy);
         
-        if (nret!=1) crWarning("XGetVisualInfo returned %i visuals for %p", nret, config);
+        if (nret!=1)
+        {
+            crWarning("XGetVisualInfo returned %i visuals for %p", nret, config);
+            /* Hack for glut based apps.
+               We fail to patch first call to glXChooseFBConfigSGIX, which ends up in the mesa's fbconfigs being passed to this function later.
+            */
+            if (!nret && config)
+            {
+                temp.visualid = (VisualID) ((__GLcontextModes*)config)->visualID;
+                XLOCK(dpy);
+                pret = XGetVisualInfo(dpy, VisualIDMask, &temp, &nret);
+                XUNLOCK(dpy);
+                crWarning("Retry with %#x returned %i visuals", ((__GLcontextModes*)config)->visualID, nret);
+            }
+        }
         //crDebug("glXGetVisualFromFBConfig(cfg/visid==0x%x): depth=%i", (int) config, pret->depth);
+//crDebug("here");
         return pret;
     }