|
 |
0cfe39 |
From dba4bc4f1d6dfee9fe9433c55b15653d703bed4f Mon Sep 17 00:00:00 2001
|
|
|
0cfe39 |
From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
|
|
|
0cfe39 |
Date: Wed, 2 Dec 2020 20:55:52 +0100
|
|
|
9fb289 |
Subject: [PATCH 09/52] Ensure that grabbing is performed in correct context
|
|
|
0cfe39 |
|
|
|
0cfe39 |
For multi-display rendering on EGL, it is mandatory that the grabbing of
|
|
|
0cfe39 |
the surface happens in the same EGL context as the surface belongs to.
|
|
|
0cfe39 |
By adding the grabbing to the rendering stage of the image, this
|
|
|
0cfe39 |
relation is forced.
|
|
|
0cfe39 |
|
|
|
0cfe39 |
Task-number: QTBUG-87597
|
|
|
0cfe39 |
Change-Id: I50f40df1215aa771d714065e942c5a738ba6269f
|
|
|
0cfe39 |
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
|
|
|
0cfe39 |
(cherry picked from commit ab3a1a07f3d1e0d5a9e9d97b6b3b587180e2f4c8)
|
|
|
0cfe39 |
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
0cfe39 |
---
|
|
|
0cfe39 |
src/compositor/compositor_api/qwaylandquickcompositor.cpp | 2 +-
|
|
|
0cfe39 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
0cfe39 |
|
|
|
0cfe39 |
diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
|
|
|
0cfe39 |
index 49f0860e..db1cf00f 100644
|
|
|
0cfe39 |
--- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp
|
|
|
0cfe39 |
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
|
|
|
0cfe39 |
@@ -161,7 +161,7 @@ void QWaylandQuickCompositor::grabSurface(QWaylandSurfaceGrabber *grabber, const
|
|
|
0cfe39 |
GrabState *state = new GrabState;
|
|
|
0cfe39 |
state->grabber = grabber;
|
|
|
0cfe39 |
state->buffer = buffer;
|
|
|
0cfe39 |
- static_cast<QQuickWindow *>(output->window())->scheduleRenderJob(state, QQuickWindow::NoStage);
|
|
|
0cfe39 |
+ static_cast<QQuickWindow *>(output->window())->scheduleRenderJob(state, QQuickWindow::AfterRenderingStage);
|
|
|
0cfe39 |
#else
|
|
|
0cfe39 |
emit grabber->failed(QWaylandSurfaceGrabber::UnknownBufferType);
|
|
|
0cfe39 |
#endif
|
|
|
0cfe39 |
--
|
|
|
9fb289 |
2.35.1
|
|
|
0cfe39 |
|