X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace%2Fd3dretrace_main.cpp;h=3de6daa6553b213d1a926a4157ed63b01200a32d;hb=61a25343ca58efa75b2d2d7c8b062b9ccee1d02b;hp=7471195e42bbf98cbb5006f265bee1cdff47d943;hpb=2b46364c974c95b8e2568f1e3f13e888c46c9d04;p=apitrace

diff --git a/retrace/d3dretrace_main.cpp b/retrace/d3dretrace_main.cpp
index 7471195..3de6daa 100644
--- a/retrace/d3dretrace_main.cpp
+++ b/retrace/d3dretrace_main.cpp
@@ -28,56 +28,22 @@
 
 #include "os_string.hpp"
 
-#include "d3d9state.hpp"
+#include "d3dstate.hpp"
 #include "retrace.hpp"
 #include "d3dretrace.hpp"
 
 
-IDirect3DDevice9 *
-d3dretrace::pLastDirect3DDevice9 = NULL;
-
-
 void
 retrace::setUp(void) {
-    if (retrace::debug) {
-        /* 
-         * XXX: D3D9D only works for simple things, it often introduces errors
-         * on complex traces, or traces which use unofficial D3D9 features.
-         */
-        if (0) {
-            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) {
-    if (!d3dretrace::pLastDirect3DDevice9) {
-        return NULL;
-    }
-
-    return d3dstate::getRenderTargetImage(d3dretrace::pLastDirect3DDevice9);
-}
-
-
-bool
-retrace::dumpState(std::ostream &os)
-{
-    if (!d3dretrace::pLastDirect3DDevice9) {
-        return false;
-    }
-
-    d3dstate::dumpDevice(os, d3dretrace::pLastDirect3DDevice9);
-
-    return true;
+    retracer.addCallbacks(d3dretrace::dxgi_callbacks);
 }