d3dretrace: Merge d3d9 and d3d10 retracing.

[apitrace] / retrace / d3d9retrace.py

diff --git a/retrace/d3d9retrace.py b/retrace/d3d9retrace.py
index 0564c0040989f0074f31ab8a6377f94cf7dd240c..4b5853bdd3e2be3e0b987cbe2c9a9daf4b429a61 100644 (file)
--- a/retrace/d3d9retrace.py
+++ b/retrace/d3d9retrace.py
@@ -28,7 +28,7 @@
 
 
 from dllretrace import DllRetracer as Retracer
-import specs.stdapi as stdapi
+from specs.stdapi import API
 from specs.d3d9 import *
 
 
@@ -63,7 +63,7 @@ retrace::dumpState(std::ostream &os)
         print 'static std::map<void *, void *> _maps;'
         print
 
-        self.table_name = 'd3dretrace::d3d_callbacks'
+        self.table_name = 'd3dretrace::d3d9_callbacks'
 
         Retracer.retraceApi(self, api)
 
@@ -148,5 +148,7 @@ if __name__ == '__main__':
 
 '''
 
+    api = API()
+    api.addModule(d3d9)
     retracer = D3DRetracer()
-    retracer.retraceModule(d3d9)
+    retracer.retraceApi(api)