Prefer eglGetPlatformDisplay to eglGetDisplay

1 files changed, 52 insertions, 0 deletions

diff --git a/0001-Fix-some-EGLDisplay-abuse.patch b/0001-Fix-some-EGLDisplay-abuse.patch
new file mode 100644
index 0000000..5071d8c
--- /dev/null
+++ b/0001-Fix-some-EGLDisplay-abuse.patch
@@ -0,0 +1,52 @@
+From dc0e3f9d949723856dde43b7ee3a8aa87b320c88 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 10 Oct 2016 14:10:38 -0400
+Subject: [PATCH 1/2] Fix some EGLDisplay * abuse
+
+EGLDisplays are already opaque pointers, and eglGetDisplay returns an
+EGLDisplay not a pointer to one.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+ gdk/wayland/gdkglcontext-wayland.c | 2 +-
+ gtk/inspector/general.c            | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
+index 7733188..ae1354e 100644
+--- a/gdk/wayland/gdkglcontext-wayland.c
++++ b/gdk/wayland/gdkglcontext-wayland.c
+@@ -279,7 +279,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
+ {
+   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
+   EGLint major, minor;
+-  EGLDisplay *dpy;
++  EGLDisplay dpy;
+ 
+   if (display_wayland->have_egl)
+     return TRUE;
+diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
+index 31dd6aa..77d0a76 100644
+--- a/gtk/inspector/general.c
++++ b/gtk/inspector/general.c
+@@ -209,7 +209,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen,
+ #ifdef GDK_WINDOWING_WAYLAND
+ static void
+ append_egl_extension_row (GtkInspectorGeneral *gen,
+-                          EGLDisplay          *dpy,
++                          EGLDisplay          dpy,
+                           const gchar         *ext)
+ {
+   add_check_row (gen, GTK_LIST_BOX (gen->priv->gl_box), ext, epoxy_has_egl_extension (dpy, ext), 0);
+@@ -250,7 +250,7 @@ init_gl (GtkInspectorGeneral *gen)
+   if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))
+     {
+       GdkDisplay *display = gdk_display_get_default ();
+-      EGLDisplay *dpy;
++      EGLDisplay dpy;
+       EGLint major, minor;
+       gchar *version;
+ 
+-- 
+2.9.3
+