glretrace: Put currentContext on TLS.

[apitrace] / retrace / glretrace_cgl.cpp

diff --git a/retrace/glretrace_cgl.cpp b/retrace/glretrace_cgl.cpp
index 1197015b167ced08a9f44fc874a8872d6b24f83b..613ee81d237073b9d272afd6c87becce1f188e01 100644 (file)
--- a/retrace/glretrace_cgl.cpp
+++ b/retrace/glretrace_cgl.cpp
@@ -235,9 +235,12 @@ static void retrace_CGLSetCurrentContext(trace::Call &call) {
 
 
 static void retrace_CGLFlushDrawable(trace::Call &call) {
-    if (currentDrawable && currentContext) {
+    unsigned long long ctx = call.arg(0).toUIntPtr();
+    Context *context = getContext(ctx);
+
+    if (context) {
         if (retrace::doubleBuffer) {
-            currentDrawable->swapBuffers();
+            context->drawable->swapBuffers();
         } else {
             glFlush();
         }
@@ -287,7 +290,7 @@ static void retrace_CGLTexImageIOSurface2D(trace::Call &call) {
 
     GLvoid * pixels = NULL;
 
-    if (glretrace::currentContext != context) {
+    if (glretrace::getCurrentContext() != context) {
         if (retrace::debug) {
             retrace::warning(call) << "current context mismatch\n";
         }