Eliminate destroyContext.

Same as releaseContext.
apitrace · Jul 11, 2012 · 5c298db · 5c298db
1 parent 2f7a65c
commit 5c298db
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 22 deletions.
diff --git a/wrappers/cgltrace.py b/wrappers/cgltrace.py
@@ -53,7 +53,7 @@ def traceFunctionImplBody(self, function):
 
         if function.name == 'CGLDestroyContext':
             # The same rule applies here about the  as for CGLReleaseContext.
-            print '    if (gltrace::destroyContext((uintptr_t)ctx)) {'
+            print '    if (gltrace::releaseContext((uintptr_t)ctx)) {'
             print '        if (_CGLGetCurrentContext() == ctx) {'
             print '            gltrace::clearContext();'
             print '        }'

diff --git a/wrappers/egltrace.py b/wrappers/egltrace.py
@@ -77,8 +77,9 @@ def traceFunctionImplBody(self, function):
             print '    }'
 
         if function.name == 'eglDestroyContext':
-            print '    if (_result)'
+            print '    if (_result) {'
-            print '        gltrace::destroyContext((uintptr_t)ctx);'
+            print '        gltrace::releaseContext((uintptr_t)ctx);'
+            print '    }'
 
 if __name__ == '__main__':
     print '#include <stdlib.h>'

diff --git a/wrappers/gltrace.hpp b/wrappers/gltrace.hpp
@@ -47,17 +47,18 @@ class Context {
     bool user_arrays_nv;
     unsigned retain_count;
 
-    Context(void) : profile(PROFILE_COMPAT), user_arrays(false),
+    Context(void) :
-                    user_arrays_arb(false), user_arrays_nv(false),
+        profile(PROFILE_COMPAT),
-                    retain_count(0) { }
+        user_arrays(false),
+        user_arrays_arb(false),
+        user_arrays_nv(false),
+        retain_count(0)
+    { }
 };
 
 void
 createContext(uintptr_t context_id);
 
-bool
-destroyContext(uintptr_t context_id);
-
 void
 retainContext(uintptr_t context_id);
 

diff --git a/wrappers/gltrace_state.cpp b/wrappers/gltrace_state.cpp
@@ -126,15 +126,6 @@ void createContext(uintptr_t context_id)
     context_map_mutex.unlock();
 }
 
-/*
- * return true if the context has been destroyed, false otherwise. See
- * the note at releaseContext about the actual ccontext lifetime.
- */
-bool destroyContext(uintptr_t context_id)
-{
-    return releaseContext(context_id);
-}
-
 void setContext(uintptr_t context_id)
 {
     ThreadState *ts = get_ts();

diff --git a/wrappers/glxtrace.py b/wrappers/glxtrace.py
@@ -46,6 +46,9 @@ def isFunctionPublic(self, function):
     ]
 
     def traceFunctionImplBody(self, function):
+        if function.name == 'glXDestroyContext':
+            print '    gltrace::releaseContext((uintptr_t)ctx);'
+
         GlTracer.traceFunctionImplBody(self, function)
 
         if function.name == 'glXCreateContext':
@@ -60,9 +63,6 @@ def traceFunctionImplBody(self, function):
             print '            gltrace::clearContext();'
             print '    }'
 
-        if function.name == 'glXDestroyContext':
-            print '    gltrace::destroyContext((uintptr_t)ctx);'
-
 
 if __name__ == '__main__':
     print

diff --git a/wrappers/wgltrace.py b/wrappers/wgltrace.py
@@ -46,7 +46,7 @@ def traceFunctionImplBody(self, function):
             print '    if (_wglGetCurrentContext() == hglrc) {'
             print '        gltrace::clearContext();'
             print '    }'
-            print '    gltrace::destroyContext((uintptr_t)hglrc);'
+            print '    gltrace::releaseContext((uintptr_t)hglrc);'
 
         GlTracer.traceFunctionImplBody(self, function)