Changeset 65563 in vbox for trunk/src/VBox/Additions/common/crOpenGL

Timestamp:

Feb 1, 2017 11:51:44 AM (8 years ago)

Author:

vboxsync

Message:

bugref:8748: Additions/Graphics/Wayland: investigate EGLStreams support feasibility: modify guest GLX visual and FBConfig code to be independent of guest X11 visual configuration. Now we just report one of each with 32-bit ARGB instead of one for every X11 visual on the guest, some with 0-bit alpha and some with 8-bit. There was a comment in the code that we needed both 24-bit and 32-bit. I do not know why we should need 24-bit.

Change tested with a couple Unity and GNOME Shell versions, and glxinfo, glxgears, eglinfo and eglgears. More good test cases would be good. glxmark2 fails with both the old and the new code.

File:

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

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

@@ -426 +426 @@
 
         case GLX_USE_GL:
-            *value = 1;
+            *value = vis->visualid == XVisualIDFromVisual(DefaultVisual(dpy, vis->screen));
             break;
 
@@ -1004 +1004 @@
 {
     ATTRIB_TYPE *attrib;
-    XVisualInfo *pVis;
     GLX_Pixmap_t *pGlxPixmap;
     (void) dpy;
@@ -1040 +1039 @@
     }
 
-    pVis = VBOXGLXTAG(glXGetVisualFromFBConfig)(dpy, config);
-    if (!pVis)
-    {
-        crWarning("Unknown config %p in glXCreatePixmap", config);
-        return 0;
-    }
-
-    pGlxPixmap->format = pVis->depth==24 ? GL_RGB:GL_RGBA;
+    pGlxPixmap->format = GL_RGBA;
     pGlxPixmap->target = GL_TEXTURE_2D;
 
@@ -1224 +1216 @@
             break;
         case GLX_BIND_TO_TEXTURE_RGBA_EXT:
-            *value = pVisual->depth==32;
+            *value = True;
             break;
         case GLX_BIND_TO_TEXTURE_RGB_EXT:
@@ -1238 +1230 @@
         case GLX_ALPHA_SIZE:
             //crDebug("attribute=GLX_ALPHA_SIZE");
-            *value = pVisual->depth==32 ? 8:0;
+            *value = 8;
             break;
         case GLX_BUFFER_SIZE:
             //crDebug("attribute=GLX_BUFFER_SIZE");
-            *value = pVisual->depth;
+            *value = 32;
             break;
         case GLX_STENCIL_SIZE:
@@ -1313 +1305 @@
 }
 
-#if !defined(VBOX_NO_NATIVEGL) || 1 /* need fbconfigs atleast for depths 24 and 32 */
-DECLEXPORT(GLXFBConfig *) VBOXGLXTAG(glXGetFBConfigs)(Display *dpy, int screen, int *nelements)
-{
-    GLXFBConfig *pGLXFBConfigs = NULL;
-    /*struct VisualInfo *v; */
-    int i=0;
-    XVisualInfo searchvis, *pVisuals;
-
-    *nelements = 0;
-
-    /*
-    for (v = VisualInfoList; v; v = v->next) {
-        if (v->dpy == dpy && v->screen == screen)
-            ++*nelements;
-    }
-
-    if (*nelements)
-        pGLXFBConfigs = crAlloc(*nelements * sizeof(GLXFBConfig));
-
-    for (v = VisualInfoList; v && i<*nelements; v = v->next) {
-        if (v->dpy == dpy && v->screen == screen)
-            pGLXFBConfigs[i++] = (GLXFBConfig) v->visualid;
-    }
-    */
-
-    /*@todo doesn't really list all the common visuals, have to use some static list*/
-    searchvis.screen = screen;
-    XLOCK(dpy);
-    pVisuals = XGetVisualInfo(dpy, VisualScreenMask, &searchvis, nelements);
-    XUNLOCK(dpy);
-
-    if (*nelements)
-        pGLXFBConfigs = crAlloc(*nelements * sizeof(GLXFBConfig));
-
-    for (i=0; i<*nelements; ++i)
-    {
-        pGLXFBConfigs[i] = (GLXFBConfig) pVisuals[i].visualid;
-    }
-
-    XFree(pVisuals);
-
-    crDebug("glXGetFBConfigs returned %i configs", *nelements);
-    for (i=0; i<*nelements; ++i)
-    {
-        crDebug("glXGetFBConfigs[%i]=%p", i, pGLXFBConfigs[i]);
-    }
-    return pGLXFBConfigs;
-}
-#else /* not 0 */
 DECLEXPORT(GLXFBConfig *) VBOXGLXTAG(glXGetFBConfigs)(Display *dpy, int screen, int *nelements)
 {
@@ -1376 +1319 @@
     for (i=0; i<*nelements; ++i)
     {
-        crDebug("glXGetFBConfigs[%i]=0x%x", i, (unsigned int) pGLXFBConfigs[i]);
+        crDebug("glXGetFBConfigs[%i]=0x%x", i, (unsigned)(uintptr_t) pGLXFBConfigs[i]);
     }
     return pGLXFBConfigs;
 }
-#endif
 
 DECLEXPORT(void) VBOXGLXTAG(glXGetSelectedEvent)(Display *dpy, GLXDrawable draw, unsigned long *event_mask)