Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtwayland: remove OpenGL ES 2 API patch, which was upstreamed 

Commit 9d4490a ("qtwayland: really use OpenGL ES 2 API for decoration blitter")
from meta-qt5 layer backports an upstream patch to Yocto 3.0 (Zeus), which
conflicts with the same patch integrated in meta-digi layer.
This commit removes the patch from meta-digi.

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra 2020-05-20 14:10:30 +02:00
parent 9ddce7fde9
commit 5e2750082f
2 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
meta-digi-dey/recipes-qt/qt5/qtwayland/0004-Client-really-use-OpenGL-ES-2-API-for-decoration-bli.patch
View File

@ -1,34 +0,0 @@
From 6e9d6f166dec65e91b4dbf73ccb60170e0a56dc8 Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Tue, 26 Nov 2019 09:39:25 +0100
Subject: [PATCH] Client: really use OpenGL ES 2 API for decoration blitter
Really use (as the comment states) the OpenGL ES 2 API for
the decoration blitter.
Upstream-Status: Backport from dev branch
Task-number: QTBUG-80356
Change-Id: I4c923343e721a824521fb9b2b36be5d2de984325
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
---
.../client/wayland-egl/qwaylandglcontext.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
index 5bd2760d..7679a5fb 100644
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
@@ -312,7 +312,7 @@ QWaylandGLContext::QWaylandGLContext(EGLDisplay eglDisplay, QWaylandDisplay *dis
// Create an EGL context for the decorations blitter. By using a dedicated context we don't need to make sure to not
// change the context state and we also use OpenGL ES 2 API independently to what the app is using to draw.
- QVector<EGLint> eglDecorationsContextAttrs = { EGL_CONTEXT_CLIENT_VERSION, 1, EGL_NONE };
+ QVector<EGLint> eglDecorationsContextAttrs = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
m_decorationsContext = eglCreateContext(m_eglDisplay, m_config, m_context, eglDecorationsContextAttrs.constData());
if (m_decorationsContext == EGL_NO_CONTEXT)
qWarning("QWaylandGLContext: Failed to create the decorations EGLContext. Decorations will not be drawn.");
--
2.17.1

1
meta-digi-dey/recipes-qt/qt5/qtwayland_%.bbappend
View File

@ -5,7 +5,6 @@ SRC_URI_append = " \
file://0001-Compositor-Fix-access-to-member-of-null-reference.patch \
file://0002-Compositor-Fix-crashes-when-destroying-uninitialized.patch \
file://0003-Client-Fix-crash-when-showing-a-child-window-with-a-.patch \
file://0004-Client-really-use-OpenGL-ES-2-API-for-decoration-bli.patch \
file://0005-Client-Always-close-popups-when-hiding-a-window.patch \
file://0006-Avoid-potential-double-deletion.patch \
"