From 8fb9cea4515161effdaee256dd033c36cfa21689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 17 Apr 2014 15:41:27 -0700 Subject: [PATCH] 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 --- cogl/winsys/cogl-winsys-egl-kms.c | 6 ------ cogl/winsys/cogl-winsys-egl-wayland.c | 6 ------ 2 files changed, 12 deletions(-) diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c index 8c4176e9f..958c80fb1 100644 --- a/cogl/winsys/cogl-winsys-egl-kms.c +++ b/cogl/winsys/cogl-winsys-egl-kms.c @@ -283,12 +283,6 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer, egl_renderer->platform = g_slice_new0 (CoglRendererKMS); kms_renderer = egl_renderer->platform; - /* 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", "drm", 1); - kms_renderer->fd = -1; kms_renderer->opened_fd = -1; diff --git a/cogl/winsys/cogl-winsys-egl-wayland.c b/cogl/winsys/cogl-winsys-egl-wayland.c index c6310801f..2b359cb1d 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;