Performance: reduce TLS overhead of QGLContext::currentContext()

The handling for the current QGLContext was looking up the same
TLS data several times per call (hasLocalData() and localData()
calls particularly).

This change also refactors the code a little so that the
setting of the QGLContext within makeCurrent() and doneCurrent()
is in one location in the code instead of six (one per platform).

Reviewed-by: Michael Brasser
Reviewed-by: Sarah Smith

1 files changed, 2 insertions, 8 deletions

diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp
index 78dad80..2f9e225 100644
--- a/src/opengl/qgl_win.cpp
+++ b/src/opengl/qgl_win.cpp
@@ -1173,11 +1173,7 @@ void QGLContext::makeCurrent()
     }
 
     if (wglMakeCurrent(d->dc, d->rc)) {
-        if (!qgl_context_storage.hasLocalData() && QThread::currentThread())
-            qgl_context_storage.setLocalData(new QGLThreadContext);
-        if (qgl_context_storage.hasLocalData())
-            qgl_context_storage.localData()->context = this;
-        currentCtx = this;
+        QGLContextPrivate::setCurrentContext(this);
     } else {
         qwglError("QGLContext::makeCurrent()", "wglMakeCurrent");
     }
@@ -1187,10 +1183,8 @@ void QGLContext::makeCurrent()
 void QGLContext::doneCurrent()
 {
     Q_D(QGLContext);
-    currentCtx = 0;
     wglMakeCurrent(0, 0);
-    if (qgl_context_storage.hasLocalData())
-        qgl_context_storage.localData()->context = 0;
+    QGLContextPrivate::setCurrentContext(0);
     if (deviceIsPixmap() && d->hbitmap) {
         QPixmap *pm = static_cast<QPixmap *>(d->paintDevice);
         *pm = QPixmap::fromWinHBITMAP(d->hbitmap);