diff mbox series

[kirkstone,3/7] weston: drop allow-visual_id-to-be-0 patch

Message ID 20230524181122.35202-4-rs@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series Rootless Weston and Weston patch cleanup | expand

Commit Message

Randolph Sapp May 24, 2023, 6:11 p.m. UTC 
From: Randolph Sapp <rs@ti.com>

Weston 10 now checks to see if eglGetConfigAttrib returns anything
before handling the actual EGL_NATIVE_VISUAL_ID value.

Signed-off-by: Randolph Sapp <rs@ti.com>
---
 .../0002-weston-Allow-visual_id-to-be-0.patch | 34 -------------------
 .../wayland/weston_10.0.2.bbappend            |  1 -
 2 files changed, 35 deletions(-)
 delete mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0002-weston-Allow-visual_id-to-be-0.patch
diff mbox series

Patch

diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0002-weston-Allow-visual_id-to-be-0.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0002-weston-Allow-visual_id-to-be-0.patch
deleted file mode 100644
index a354d947..00000000
--- a/meta-arago-distro/recipes-graphics/wayland/weston/0002-weston-Allow-visual_id-to-be-0.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-From 5695eab02bb88318bf99d568b6d0e4592d5f9981 Mon Sep 17 00:00:00 2001
-From: Karthik Ramanan <a0393906@ti.com>
-Date: Mon, 12 Mar 2018 10:47:02 +0530
-Subject: [PATCH 2/4] weston: Allow visual_id to be 0
-
-The inquiry of visual id from egl API eglGetConfigAttrib(EGL_NATIVE_VISUAL_ID)
-is an optional feature. The visual id will be set to 0 if this feature is
-not supported. Therefore, the return condition @function match_config_to_visual()
-should be (id == visual_id || id == 0) instead of (id == visual_id)
-
-Upstream status: Pending
-
-Signed-off-by: Eric Ruei <e-ruei1@ti.com>
-Signed-off-by: Karthik Ramanan <a0393906@ti.com>
----
- libweston/gl-renderer.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c
-index c6091af..9299dc6 100644
---- a/libweston/gl-renderer.c
-+++ b/libweston/gl-renderer.c
-@@ -2575,7 +2575,7 @@ match_config_to_visual(EGLDisplay egl_display,
- 				&id))
- 			continue;
- 
--		if (id == visual_id)
-+		if (id == visual_id || id == 0)
- 			return i;
- 	}
- 
--- 
-1.9.1
-
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend
index 16ed6e67..dd67eec1 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston_10.0.2.bbappend
@@ -2,7 +2,6 @@  FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 PR:append = ".arago1"
 
-#        file://0002-weston-Allow-visual_id-to-be-0.patch
 SRC_URI += " \
         file://0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \
         file://0001-backend-drm-Select-plane-based-on-current-attached-C.patch \