diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2022-04-26 03:57:12 -0700 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2022-04-27 06:13:13 -0700 |
| commit | 8161726619b71fb5bd8f77c7fd020d53d5ac7c9e (patch) | |
| tree | 7dfd7bf41a5ba821dab0c304d244d49e8b4653fe /src/opengl/qopenglcompositor.cpp | |
| parent | 9861fd09cba4fe220f668585c78a7324d069ef94 (diff) | |
Revive eglfs' raster window support
A number of consequences of the new rhi-based backingstore
composition were not handled. Most importantly, the fact
that RasterGLSurface is not a thing anymore in practice
causes challenges because we can no longer decide just
based on the surfaceType what a QWindow with OpenGLSurface
would be. (a plain GL window or a GL window with a backing
store?) Also, the backingstore needs to be able to initialize
its backing QRhi by itself, because with eglfs going through
OpenGL is the only way.
Amends 68a4c5da9a080101cccd8a3b2edb1c908da0ca8e
Fixes: QTBUG-102750
Change-Id: Ia1ca59d01e3012264a76b50e591612fdcc2a0bd6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/opengl/qopenglcompositor.cpp')
| -rw-r--r-- | src/opengl/qopenglcompositor.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/opengl/qopenglcompositor.cpp b/src/opengl/qopenglcompositor.cpp index a5fe4dda304..9f661510adc 100644 --- a/src/opengl/qopenglcompositor.cpp +++ b/src/opengl/qopenglcompositor.cpp @@ -94,14 +94,17 @@ QOpenGLCompositor::~QOpenGLCompositor() compositor = 0; } -void QOpenGLCompositor::setTarget(QOpenGLContext *context, QWindow *targetWindow, - const QRect &nativeTargetGeometry) +void QOpenGLCompositor::setTargetWindow(QWindow *targetWindow, const QRect &nativeTargetGeometry) { - m_context = context; m_targetWindow = targetWindow; m_nativeTargetGeometry = nativeTargetGeometry; } +void QOpenGLCompositor::setTargetContext(QOpenGLContext *context) +{ + m_context = context; +} + void QOpenGLCompositor::setRotation(int degrees) { m_rotation = degrees; |