Merge remote-tracking branch 'github/master' into profile-gui

[apitrace] / retrace / glretrace.py

diff --git a/retrace/glretrace.py b/retrace/glretrace.py
index 8864296868ef9c924a2caef09af94b751263cad8..987798fe6a0c5cab01eb015a93ef62f708a50aea 100644 (file)
--- a/retrace/glretrace.py
+++ b/retrace/glretrace.py
@@ -299,7 +299,9 @@ class GlRetracer(Retracer):
         )
 
         if function.name in ('glUseProgram', 'glUseProgramObjectARB'):
-            print r'    glretrace::setActiveProgram((call.arg(0)).toUInt());'
+            print r'    if (glretrace::currentContext) {'
+            print r'        glretrace::currentContext->activeProgram = call.arg(0).toUInt();'
+            print r'    }'
 
         # Only profile if not inside a list as the queries get inserted into list
         if function.name == 'glNewList':