diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-07-30 14:22:24 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-08-03 22:50:22 +0000 |
| commit | f8b17a297e41f4c0d0656c58c25a0060f2555f97 (patch) | |
| tree | fbf82289839cd9caee59aa471fe8fca11dd5c738 /src/plugins/platforms/cocoa/qnsview_drawing.mm | |
| parent | 68f20bb8f4b74e313e1d44a7d7e78af6d8b5b3ea (diff) | |
macOS: Propagate [NSOpenGLContext setView:] failures
Instead of trying to mask situations where [NSOpenGLContext setView:]
will fail (such as calling it for a view that's not part of a window
yet, or part of a window that hasn't been shown), we report the error
up through the API, so that QOpenGLContext::makeCurrent() will return
false. This is documented to occur e.g. when "the surface is not exposed,
or the graphics hardware is not available due to e.g. the application
being suspended."
QGLWidget was taught how to deal with this situation in cc27a50e. Other
Qt APIs seem to handle it fine, but if regressions occur they should be
fixable though the same logic as in cc27a50e.
Change-Id: I92775fc165444696b6c5b44fa0e28ce3c4ad2190
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qnsview_drawing.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview_drawing.mm | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview_drawing.mm b/src/plugins/platforms/cocoa/qnsview_drawing.mm index 8ebe27f0c2..4f9d17504d 100644 --- a/src/plugins/platforms/cocoa/qnsview_drawing.mm +++ b/src/plugins/platforms/cocoa/qnsview_drawing.mm @@ -39,22 +39,6 @@ // This file is included from qnsview.mm, and only used to organize the code -@implementation QT_MANGLE_NAMESPACE(QNSView) (DrawingAPI) - -#ifndef QT_NO_OPENGL -- (void)setQCocoaGLContext:(QCocoaGLContext *)context -{ - m_glContext = context; - [m_glContext->nsOpenGLContext() setView:self]; - if (![m_glContext->nsOpenGLContext() view]) { - //was unable to set view - m_shouldSetGLContextinDrawRect = true; - } -} -#endif - -@end - @implementation QT_MANGLE_NAMESPACE(QNSView) (Drawing) - (BOOL)isOpaque @@ -84,19 +68,7 @@ exposedRegion += QRectF::fromCGRect(dirtyRects[i]).toRect(); qCDebug(lcQpaDrawing) << "[QNSView drawRect:]" << m_platformWindow->window() << exposedRegion; - [self updateRegion:exposedRegion]; -} - -- (void)updateRegion:(QRegion)dirtyRegion -{ -#ifndef QT_NO_OPENGL - if (m_glContext && m_shouldSetGLContextinDrawRect) { - [m_glContext->nsOpenGLContext() setView:self]; - m_shouldSetGLContextinDrawRect = false; - } -#endif - - m_platformWindow->handleExposeEvent(dirtyRegion); + m_platformWindow->handleExposeEvent(exposedRegion); } - (BOOL)shouldUseMetalLayer @@ -174,7 +146,7 @@ qCDebug(lcQpaDrawing) << "[QNSView displayLayer]" << m_platformWindow->window(); // FIXME: Find out if there's a way to resolve the dirty rect like in drawRect: - [self updateRegion:QRectF::fromCGRect(self.bounds).toRect()]; + m_platformWindow->handleExposeEvent(QRectF::fromCGRect(self.bounds).toRect()); } - (void)viewDidChangeBackingProperties |