specs: Allow an API to spread across multiple modules.

[apitrace] / wrappers / cgltrace.py

diff --git a/wrappers/cgltrace.py b/wrappers/cgltrace.py
index e7cbd7b123fa6c834e2180f04bcd769071ac2237..c56edf24443911611050747fa9cc0a7fbec2688b 100644 (file)
--- a/wrappers/cgltrace.py
+++ b/wrappers/cgltrace.py
@@ -28,7 +28,7 @@
 
 
 from gltrace import GlTracer
-from specs.stdapi import API
+from specs.stdapi import Module, API
 from specs.glapi import glapi
 from specs.cglapi import cglapi
 
@@ -93,9 +93,11 @@ if __name__ == '__main__':
     print '#include "glsize.hpp"'
     print
 
+    module = Module()
+    module.mergeModule(cglapi)
+    module.mergeModule(glapi)
     api = API()
-    api.addApi(cglapi)
-    api.addApi(glapi)
+    api.addModule(module)
     tracer = CglTracer()
     tracer.traceApi(api)