d3dretrace: Force DWM traces to run on a window.

[apitrace] / wrappers / glxtrace.py

diff --git a/wrappers/glxtrace.py b/wrappers/glxtrace.py
index 21bf98c9bfc7f16cd6cdde99a07cc9418690eba8..9c0f87dbcb443fba7fd520317368877062550c33 100644 (file)
--- a/wrappers/glxtrace.py
+++ b/wrappers/glxtrace.py
@@ -29,7 +29,7 @@
 
 
 from gltrace import GlTracer
-from specs.stdapi import API
+from specs.stdapi import Module, API
 from specs.glapi import glapi
 from specs.glxapi import glxapi
 
@@ -48,7 +48,7 @@ class GlxTracer(GlTracer):
     createContextFunctionNames = [
         'glXCreateContext',
         'glXCreateContextAttribsARB',
-        'glXCreateContextWithConfigSGIX'
+        'glXCreateContextWithConfigSGIX',
         'glXCreateNewContext',
     ]
 
@@ -101,9 +101,11 @@ if __name__ == '__main__':
     print '#include "glsize.hpp"'
     print
 
+    module = Module()
+    module.mergeModule(glxapi)
+    module.mergeModule(glapi)
     api = API()
-    api.addApi(glxapi)
-    api.addApi(glapi)
+    api.addModule(module)
     tracer = GlxTracer()
     tracer.traceApi(api)