diff options
| author | Marek Vasut <marex@denx.de> | 2020-05-11 14:05:04 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-05-11 17:36:37 +0200 |
| commit | 9d4490a0f4e1bfeba2660e79e1357f39b64f8027 (patch) | |
| tree | 36bdab2d91ce85cbab8271e353bac6aa344edf4a | |
| parent | 852e279a45da2b68719fecdaad3573b2ada9558c (diff) | |
qtwayland: really use OpenGL ES 2 API for decoration blitter
Really use (as the comment states) the OpenGL ES 2 API for
the decoration blitter.
Fixes: QTBUG-80356
Signed-off-by: Marek Vasut <marex@denx.de>
| -rw-r--r-- | recipes-qt/qt5/qtwayland/0003-Client-really-use-OpenGL-ES-2-API-for-decoration-bli.patch | 33 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwayland/0003-Client-really-use-OpenGL-ES-2-API-for-decoration-bli.patch b/recipes-qt/qt5/qtwayland/0003-Client-really-use-OpenGL-ES-2-API-for-decoration-bli.patch new file mode 100644 index 00000000..38260c15 --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0003-Client-really-use-OpenGL-ES-2-API-for-decoration-bli.patch @@ -0,0 +1,33 @@ +From ed1f86061b66f66c0f78d185833795fd26949145 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. + +Task-number: QTBUG-80356 +Change-Id: I4c923343e721a824521fb9b2b36be5d2de984325 +Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io> +Reviewed-by: Johan Helsing <johan.helsing@qt.io> +Upstream-Status: Backport [6e9d6f166dec65e91b4dbf73ccb60170e0a56dc8] +--- + .../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 bc1f74af..da147495 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.25.1 + diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index a8b704b2..2e57e7c9 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -16,6 +16,7 @@ LIC_FILES_CHKSUM = " \ SRC_URI += " \ file://0001-tst_seatv4-Include-array.patch \ file://0002-Fix-compilation-of-linuxdmabuf-compositor-plugin.patch \ + file://0003-Client-really-use-OpenGL-ES-2-API-for-decoration-bli.patch \ " PACKAGECONFIG ?= " \ |