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

Timestamp:

Jan 28, 2017 6:22:45 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8748: Additions/Graphics/Wayland: investigate EGLStreams support feasibility: better document a test done at eglGetDisplay() time.

File:

• trunk/src/VBox/Additions/common/crOpenGL/egl.c (modified) (2 diffs)

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

@@ -135 +135 @@
 static EGLBoolean testValidDisplay(EGLNativeDisplayType hDisplay)
 {
+    void *pSymbol = dlsym(NULL, "gbm_create_device");
+
     if (hDisplay == EGL_DEFAULT_DISPLAY)
         return EGL_TRUE;
@@ -141 +143 @@
     /* This is the test that Mesa uses to see if this is a GBM "display".  Not
      * very pretty, but since no one can afford to break Mesa it should be
-     * safe. Obviously we can't support GBM for now. */
-    if (*(void **)hDisplay == dlsym(NULL, "gbm_create_device"))
+     * safe.  We need this to detect when the X server tries to load us. */
+    if (pSymbol != NULL && *(void **)hDisplay == pSymbol)
         return EGL_FALSE;
     return EGL_TRUE;