All of lore.kernel.org
 help / color / mirror / Atom feed
* [zeus/master][PATCH] gtk+3: Remove no longer needed GTK3+ GLES/EGL fix
@ 2020-02-19 22:53 Andrew F. Davis
  2020-02-19 22:56 ` Andrew F. Davis
  0 siblings, 1 reply; 2+ messages in thread
From: Andrew F. Davis @ 2020-02-19 22:53 UTC (permalink / raw)
  To: Denys Dmytriyenko, Eric Ruei; +Cc: meta-arago

We will exit this function at ->has_egl, so this patch is not
needed. Remove it and the bbappends that adds it.

Signed-off-by: Andrew F. Davis <afd@ti.com>
---
 ...land.c-cleanup-the-parameters-of-egl.patch | 61 -------------------
 .../recipes-gnome/gtk+/gtk+3_%.bbappend       | 10 ---
 2 files changed, 71 deletions(-)
 delete mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
 delete mode 100644 meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend

diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch b/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
deleted file mode 100644
index 174dbdda..00000000
--- a/meta-arago-distro/recipes-gnome/gtk+/gtk+3/0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From d4c8511b845de02271b6dcf57a6edbf01f3f1905 Mon Sep 17 00:00:00 2001
-From: Eric Ruei <e-ruei1@ti.com>
-Date: Tue, 21 Aug 2018 11:07:13 -0400
-Subject: [PATCH] gdkglcontext-wayland.c: cleanup the parameters of egl API
- calls when GLES is used
-
-eglBindAPI: use EGL_OPENGL_ES_API instead of EGL_OPENGL_API
-eglChooseConfig: need to specify EGL_OPENGL_ES2_BIT as EGL_RENDERABLE_TYPE
-
-Upstream-Status: Pending
-
-Signed-off-by: Eric Ruei <e-ruei1@ti.com>
----
- gdk/wayland/gdkglcontext-wayland.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
-index 254900d..3361eb3 100644
---- a/gdk/wayland/gdkglcontext-wayland.c
-+++ b/gdk/wayland/gdkglcontext-wayland.c
-@@ -314,6 +314,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
-   GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
-   EGLint major, minor;
-   EGLDisplay dpy;
-+  gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
- 
-   if (display_wayland->have_egl)
-     return TRUE;
-@@ -326,7 +327,7 @@ gdk_wayland_display_init_gl (GdkDisplay *display)
-   if (!eglInitialize (dpy, &major, &minor))
-     return FALSE;
- 
--  if (!eglBindAPI (EGL_OPENGL_API))
-+  if (!eglBindAPI (use_es?EGL_OPENGL_ES_API:EGL_OPENGL_API))
-     return FALSE;
- 
-   display_wayland->egl_display = dpy;
-@@ -379,6 +380,7 @@ find_eglconfig_for_window (GdkWindow  *window,
-   EGLint count;
-   EGLConfig *configs, chosen_config;
-   gboolean use_rgba;
-+  gboolean use_es = (_gdk_gl_flags & GDK_GL_GLES) != 0 ;
- 
-   int i = 0;
- 
-@@ -395,6 +397,12 @@ find_eglconfig_for_window (GdkWindow  *window,
-   attrs[i++] = EGL_BLUE_SIZE;
-   attrs[i++] = 1;
- 
-+  if (use_es)
-+    {
-+      attrs[i++] = EGL_RENDERABLE_TYPE;
-+      attrs[i++] = EGL_OPENGL_ES2_BIT;
-+    }
-+
-   use_rgba = (visual == gdk_screen_get_rgba_visual (gdk_display_get_default_screen (display)));
- 
-   if (use_rgba)
--- 
-1.9.1
-
diff --git a/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend b/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
deleted file mode 100644
index d3fe5051..00000000
--- a/meta-arago-distro/recipes-gnome/gtk+/gtk+3_%.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/egl wayland-native"
-GTKGLIBC_RRECOMMENDS = "${GTKBASE_RRECOMMENDS}"
-
-PR_append = ".arago0"
-
-SRC_URI += "\
-    file://0001-gdkglcontext-wayland.c-cleanup-the-parameters-of-egl.patch \
-"
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-19 22:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-19 22:53 [zeus/master][PATCH] gtk+3: Remove no longer needed GTK3+ GLES/EGL fix Andrew F. Davis
2020-02-19 22:56 ` Andrew F. Davis

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.