fml

Author: cscd98

gfx/common/egl_common.c

@@ -470,12 +470,19 @@ static bool check_egl_client_extension(const char *name, size_t name_len)
 
 static EGLDisplay get_egl_display(EGLenum platform, void *native)
 {
+   RARCH_LOG("[EGL] get_egl_display(platform=0x%x, native=%p)\n", (unsigned)platform, native);
+
+   RARCH_LOG("[EGL] DISPLAY=%s\n", getenv("DISPLAY"));
+   RARCH_LOG("[EGL] EGL_PLATFORM=%s\n", getenv("EGL_PLATFORM"));
+   RARCH_LOG("[EGL] WAYLAND_DISPLAY=%s\n", getenv("WAYLAND_DISPLAY"));
+   RARCH_LOG("[EGL] XDG_DIR=%s\n", getenv("XDG_DIR"));
+   RARCH_LOG("[EGL] XDG_RUNTIME_DIR=%s\n", getenv("XDG_RUNTIME_DIR"));
+   RARCH_LOG("[EGL] XKB_CONFIG_ROOT=%s\n", getenv("XKB_CONFIG_ROOT"));
+
    if (platform != EGL_NONE)
    {
-      /* If the client library supports at least EGL 1.5, then we can call
-       * eglGetPlatformDisplay. Otherwise, see if eglGetPlatformDisplayEXT
-       * is available. */
 #if defined(EGL_VERSION_1_5)
+      RARCH_LOG("[EGL] Checking for EGL 1.5 support...\n");
       if (check_egl_version(1, 5))
       {
          typedef EGLDisplay (EGLAPIENTRY * pfn_eglGetPlatformDisplay)
@@ -485,40 +492,66 @@ static EGLDisplay get_egl_display(EGLenum platform, void *native)
          RARCH_LOG("[EGL] Found EGL client version >= 1.5, trying eglGetPlatformDisplay.\n");
          ptr_eglGetPlatformDisplay = (pfn_eglGetPlatformDisplay)
             _egl_get_proc_address("eglGetPlatformDisplay");
+         RARCH_LOG("[EGL] eglGetPlatformDisplay symbol=%p\n", (void*)ptr_eglGetPlatformDisplay);
 
          if (ptr_eglGetPlatformDisplay)
          {
             EGLDisplay dpy = ptr_eglGetPlatformDisplay(platform, native, NULL);
             if (dpy != EGL_NO_DISPLAY)
+            {
+               RARCH_LOG("[EGL] eglGetPlatformDisplay succeeded: %p\n", (void*)dpy);
                return dpy;
+            }
+            else
+            {
+               EGLint err = eglGetError();
+               RARCH_ERR("[EGL] eglGetPlatformDisplay failed, error=0x%x\n", err);
+            }
          }
       }
 #endif /* defined(EGL_VERSION_1_5) */
 
 #if defined(EGL_EXT_platform_base)
+      RARCH_LOG("[EGL] Checking for EGL_EXT_platform_base...\n");
       if (check_egl_client_extension("EGL_EXT_platform_base", STRLEN_CONST("EGL_EXT_platform_base")))
       {
          PFNEGLGETPLATFORMDISPLAYEXTPROC ptr_eglGetPlatformDisplayEXT;
 
          RARCH_LOG("[EGL] Found EGL_EXT_platform_base, trying eglGetPlatformDisplayEXT.\n");
          ptr_eglGetPlatformDisplayEXT = (PFNEGLGETPLATFORMDISPLAYEXTPROC)
             _egl_get_proc_address("eglGetPlatformDisplayEXT");
+         RARCH_LOG("[EGL] eglGetPlatformDisplayEXT symbol=%p\n", (void*)ptr_eglGetPlatformDisplayEXT);
 
          if (ptr_eglGetPlatformDisplayEXT)
          {
             EGLDisplay dpy = ptr_eglGetPlatformDisplayEXT(platform, native, NULL);
             if (dpy != EGL_NO_DISPLAY)
+            {
+               RARCH_LOG("[EGL] eglGetPlatformDisplayEXT succeeded: %p\n", (void*)dpy);
                return dpy;
+            }
+            else
+            {
+               EGLint err = eglGetError();
+               RARCH_ERR("[EGL] eglGetPlatformDisplayEXT failed, error=0x%x\n", err);
+            }
          }
       }
 #endif /* defined(EGL_EXT_platform_base) */
    }
 
-   /* Either the caller didn't provide a platform type, or the EGL
-    * implementation doesn't support eglGetPlatformDisplay. In this case, try
-    * eglGetDisplay and hope for the best. */
-   RARCH_LOG("[EGL] Falling back to eglGetDisplay.\n");
-   return _egl_get_display((EGLNativeDisplayType) native);
+   RARCH_LOG("[EGL] Falling back to eglGetDisplay(native=%p)\n", native);
+   EGLDisplay dpy = _egl_get_display((EGLNativeDisplayType) native);
+   if (dpy == EGL_NO_DISPLAY)
+   {
+      EGLint err = eglGetError();
+      RARCH_ERR("[EGL] eglGetDisplay failed, error=0x%x\n", err);
+   }
+   else
+   {
+      RARCH_LOG("[EGL] eglGetDisplay succeeded: %p\n", (void*)dpy);
+   }
+   return dpy;
 }
 
 bool egl_get_native_visual_id(egl_ctx_data_t *egl, EGLint *value)