diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-09 14:32:48 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-08-09 16:11:03 +0200 |
commit | d9a95fb6a0c793c5e1ea6902dee8da1f77bb83a8 (patch) | |
tree | d0b02869954e44216546b878501d11ab71818cbe /src/plugins/platforms/xcb/qglxintegration.cpp | |
parent | 44ad7a7f2bbec33e358d1fcfc444d762e59ffe7e (diff) |
Removed Q_XCB_NOOP's from QGLXContext.
QGLXContext might be used from different threads than the gui thread, so
don't trigger any XCB logging from there.
Change-Id: I96a51ebf6987749d209b447c9ae2ac8b7298bd4c
Reviewed-on: http://codereview.qt.nokia.com/2782
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qglxintegration.cpp')
-rw-r--r-- | src/plugins/platforms/xcb/qglxintegration.cpp | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/plugins/platforms/xcb/qglxintegration.cpp b/src/plugins/platforms/xcb/qglxintegration.cpp index 38f760ede9..c35350a288 100644 --- a/src/plugins/platforms/xcb/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/qglxintegration.cpp @@ -64,7 +64,6 @@ QGLXContext::QGLXContext(QXcbScreen *screen, const QSurfaceFormat &format, QPlat , m_screen(screen) , m_context(0) { - Q_XCB_NOOP(m_screen->connection()); GLXContext shareGlxContext = 0; if (share) shareGlxContext = static_cast<const QGLXContext*>(share)->glxContext(); @@ -72,28 +71,20 @@ QGLXContext::QGLXContext(QXcbScreen *screen, const QSurfaceFormat &format, QPlat GLXFBConfig config = qglx_findConfig(DISPLAY_FROM_XCB(screen),screen->screenNumber(),format); m_context = glXCreateNewContext(DISPLAY_FROM_XCB(screen), config, GLX_RGBA_TYPE, shareGlxContext, TRUE); m_format = qglx_surfaceFormatFromGLXFBConfig(DISPLAY_FROM_XCB(screen), config, m_context); - Q_XCB_NOOP(m_screen->connection()); } QGLXContext::~QGLXContext() { - Q_XCB_NOOP(m_screen->connection()); glXDestroyContext(DISPLAY_FROM_XCB(m_screen), m_context); - Q_XCB_NOOP(m_screen->connection()); } bool QGLXContext::makeCurrent(QPlatformSurface *surface) { Q_ASSERT(surface); - Q_XCB_NOOP(m_screen->connection()); - GLXDrawable glxDrawable = static_cast<QXcbWindow *>(surface)->xcb_window(); - bool result = glXMakeCurrent(DISPLAY_FROM_XCB(m_screen), glxDrawable, m_context); - - Q_XCB_NOOP(m_screen->connection()); - return result; + return glXMakeCurrent(DISPLAY_FROM_XCB(m_screen), glxDrawable, m_context); } void QGLXContext::doneCurrent() @@ -103,15 +94,12 @@ void QGLXContext::doneCurrent() void QGLXContext::swapBuffers(QPlatformSurface *surface) { - Q_XCB_NOOP(m_screen->connection()); GLXDrawable glxDrawable = static_cast<QXcbWindow *>(surface)->xcb_window(); glXSwapBuffers(DISPLAY_FROM_XCB(m_screen), glxDrawable); - Q_XCB_NOOP(m_screen->connection()); } void (*QGLXContext::getProcAddress(const QByteArray &procName)) () { - Q_XCB_NOOP(m_screen->connection()); typedef void *(*qt_glXGetProcAddressARB)(const GLubyte *); static qt_glXGetProcAddressARB glXGetProcAddressARB = 0; static bool resolved = false; |