1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Improve QCocoaGLContext logging

Browse Source 
Change-Id: I27d0abe0eb5b0f0ba64b8787b430484c48b131c0
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Tor Arne Vestbø 2019-12-03 15:41:55 +01:00
parent 35da2b87e3
commit aabf4fbbe9
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/cocoa/qcocoaglcontext.h
View File

@ -86,6 +86,10 @@ private:
QSurfaceFormat m_format; QSurfaceFormat m_format;
QVarLengthArray<QMacNotificationObserver, 3> m_updateObservers; QVarLengthArray<QMacNotificationObserver, 3> m_updateObservers;
QAtomicInt m_needsUpdate = false; QAtomicInt m_needsUpdate = false;
#ifndef QT_NO_DEBUG_STREAM
friend QDebug operator<<(QDebug debug, const QCocoaGLContext *screen);
#endif
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

20
src/plugins/platforms/cocoa/qcocoaglcontext.mm
View File

@ -158,6 +158,8 @@ void QCocoaGLContext::initialize()
[m_context setValues:&order forParameter:NSOpenGLCPSurfaceOrder]; [m_context setValues:&order forParameter:NSOpenGLCPSurfaceOrder];
updateSurfaceFormat(); updateSurfaceFormat();
qCDebug(lcQpaOpenGLContext).verbosity(3) << "Created" << this << "based on requested" << context()->format();
} }
NSOpenGLPixelFormat *QCocoaGLContext::pixelFormatForSurfaceFormat(const QSurfaceFormat &format) NSOpenGLPixelFormat *QCocoaGLContext::pixelFormatForSurfaceFormat(const QSurfaceFormat &format)
@ -355,7 +357,7 @@ QCocoaGLContext::~QCocoaGLContext()
bool QCocoaGLContext::makeCurrent(QPlatformSurface *surface) bool QCocoaGLContext::makeCurrent(QPlatformSurface *surface)
{ {
qCDebug(lcQpaOpenGLContext) << "Making" << m_context << "current" qCDebug(lcQpaOpenGLContext) << "Making" << this << "current"
<< "in" << QThread::currentThread() << "for" << surface; << "in" << QThread::currentThread() << "for" << surface;
Q_ASSERT(surface->surface()->supportsOpenGL()); Q_ASSERT(surface->surface()->supportsOpenGL());
@ -555,4 +557,20 @@ QFunctionPointer QCocoaGLContext::getProcAddress(const char *procName)
return (QFunctionPointer)dlsym(RTLD_DEFAULT, procName); return (QFunctionPointer)dlsym(RTLD_DEFAULT, procName);
} }
#ifndef QT_NO_DEBUG_STREAM
QDebug operator<<(QDebug debug, const QCocoaGLContext *context)
{
QDebugStateSaver saver(debug);
debug.nospace();
debug << "QCocoaGLContext(" << (const void *)context;
if (context) {
if (debug.verbosity() > QDebug::DefaultVerbosity)
debug << ", " << context->format();
debug << ", " << context->nativeContext();
}
debug << ')';
return debug;
}
#endif // !QT_NO_DEBUG_STREAM
QT_END_NAMESPACE QT_END_NAMESPACE