Blame SOURCES/0007-Do-not-try-to-eglMakeCurrent-for-unintended-case.patch

de89c0
From 2c0a03e9aea13831d05ac03996949f888afd5085 Mon Sep 17 00:00:00 2001
de89c0
From: Jaehak Lee <jaehak.lee@mobis.co.kr>
de89c0
Date: Sun, 8 Nov 2020 11:40:06 +0900
de89c0
Subject: [PATCH 07/36] Do not try to eglMakeCurrent for unintended case
de89c0
de89c0
The QSGThreadedRenderLoop::hide can be called at twice,
de89c0
when the QWindowPrivate::setVisible(false) is called.
de89c0
de89c0
The eglSurface is EGL_NO_SURFACE when the second QSGThreadedRenderLoop::hide is
de89c0
called. And if EGL_KHR_surfaceless_context is supported, the eglMakeCurrent
de89c0
don't return the false.
de89c0
de89c0
But this case is not intended. So, add the defence code for above case.
de89c0
de89c0
Fixes: QTBUG-88277
de89c0
Change-Id: Ia9e5990303e98f0eedc48531e5af62ff9961f419
de89c0
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
de89c0
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
de89c0
---
de89c0
 .../client/wayland-egl/qwaylandglcontext.cpp                | 6 ++++++
de89c0
 .../client/wayland-egl/qwaylandglcontext.h                  | 1 +
de89c0
 2 files changed, 7 insertions(+)
de89c0
de89c0
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
de89c0
index ccebf43d..681f82f4 100644
de89c0
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
de89c0
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
de89c0
@@ -336,6 +336,8 @@ QWaylandGLContext::QWaylandGLContext(EGLDisplay eglDisplay, QWaylandDisplay *dis
de89c0
                                << "It may also cause the event loop to freeze in some situations";
de89c0
     }
de89c0
 
de89c0
+    m_supportSurfaceLessContext = q_hasEglExtension(m_eglDisplay, "EGL_KHR_surfaceless_context");
de89c0
+
de89c0
     updateGLFormat();
de89c0
 }
de89c0
 
de89c0
@@ -439,6 +441,10 @@ bool QWaylandGLContext::makeCurrent(QPlatformSurface *surface)
de89c0
         eglSurface = window->eglSurface();
de89c0
     }
de89c0
 
de89c0
+    if (eglSurface == EGL_NO_SURFACE && m_supportSurfaceLessContext) {
de89c0
+        return false;
de89c0
+    }
de89c0
+
de89c0
     if (!eglMakeCurrent(m_eglDisplay, eglSurface, eglSurface, m_context)) {
de89c0
         qWarning("QWaylandGLContext::makeCurrent: eglError: %x, this: %p \n", eglGetError(), this);
de89c0
         window->setCanResize(true);
de89c0
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
de89c0
index 46c7bb76..93edaec0 100644
de89c0
--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
de89c0
+++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
de89c0
@@ -93,6 +93,7 @@ private:
de89c0
     DecorationsBlitter *m_blitter = nullptr;
de89c0
     uint m_api;
de89c0
     bool m_supportNonBlockingSwap = true;
de89c0
+    bool m_supportSurfaceLessContext = false;
de89c0
 };
de89c0
 
de89c0
 }
de89c0
-- 
de89c0
2.33.1
de89c0