[cogl] cogl-winsys-egl-kms: Never set EGL_PLATFORM



commit e3e516612dcce10b949370bf82a6d821ea8f6d20
Author: Kristian Høgsberg <krh bitplanet net>
Date:   Thu Apr 17 15:41:27 2014 -0700

    cogl-winsys-egl-kms: Never set EGL_PLATFORM
    
    This environment variable predates the reliable platform detection in mesa
    and typically just causes crashes when the specified platform doesn't
    match what's passed in.  Aside from being unecessary and problematic
    it also leaks into the GNOME session, preventing clients from
    automatically detecting the wayland platform.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=728978
    
    Reviewed-by: Neil Roberts <neil linux intel com>
    
    (cherry picked from commit 8fb9cea4515161effdaee256dd033c36cfa21689)
    
    Note while forward-porting: On master this patch only affects the
    Wayland winsys. The KMS winsys never set EGL_PLATFORM on master
    because that was introduced in commit dab054200cb2135da2303 which was
    only applied to the 1.18 branch. That patch was only made to override
    the environment variable if the Wayland winsys is tried before the KMS
    winsys.

 cogl/winsys/cogl-winsys-egl-wayland.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/cogl/winsys/cogl-winsys-egl-wayland.c b/cogl/winsys/cogl-winsys-egl-wayland.c
index c849797..fb84eec 100644
--- a/cogl/winsys/cogl-winsys-egl-wayland.c
+++ b/cogl/winsys/cogl-winsys-egl-wayland.c
@@ -242,12 +242,6 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer,
 
   egl_renderer->platform_vtable = &_cogl_winsys_egl_vtable;
 
-  /* The EGL API doesn't provide for a way to explicitly select a
-   * platform when the driver can support multiple. Mesa allows
-   * selection using an environment variable though so that's what
-   * we're doing here... */
-  g_setenv ("EGL_PLATFORM", "wayland", 1);
-
   if (renderer->foreign_wayland_display)
     {
       wayland_renderer->wayland_display = renderer->foreign_wayland_display;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]