Use skiplist-based FastCallSet within trace::CallSet

[apitrace] / retrace / d3dretrace_main.cpp

diff --git a/retrace/d3dretrace_main.cpp b/retrace/d3dretrace_main.cpp
index 15053e4d1369f953b8f00d6b7fe115ad8bb681b2..3de6daa6553b213d1a926a4157ed63b01200a32d 100644 (file)
--- a/retrace/d3dretrace_main.cpp
+++ b/retrace/d3dretrace_main.cpp
@@ -27,38 +27,23 @@
 #include <string.h>
 
 #include "os_string.hpp"
+
+#include "d3dstate.hpp"
 #include "retrace.hpp"
 #include "d3dretrace.hpp"
 
 
-extern const char *g_szD3D9DllName;
-
-
 void
 retrace::setUp(void) {
-    if (retrace::debug) {
-        g_szD3D9DllName = "d3d9d.dll";
-    }
 }
 
 
 void
 retrace::addCallbacks(retrace::Retracer &retracer)
 {
+    retracer.addCallbacks(d3dretrace::d3d8_callbacks);
     retracer.addCallbacks(d3dretrace::d3d9_callbacks);
-}
-
-
-image::Image *
-retrace::getSnapshot(void) {
-    return NULL;
-}
-
-
-bool
-retrace::dumpState(std::ostream &os)
-{
-    return false;
+    retracer.addCallbacks(d3dretrace::dxgi_callbacks);
 }
 
 
@@ -68,6 +53,7 @@ retrace::flushRendering(void) {
 
 void
 retrace::waitForInput(void) {
+    /* TODO */
 }
 
 void