d3dretrace: Use DirectXTex for d3d10 state too.

[apitrace] / retrace / d3dretrace_main.cpp

diff --git a/retrace/d3dretrace_main.cpp b/retrace/d3dretrace_main.cpp
index 133f3a7ae483678a88b13728241bc4c63e20a508..3de6daa6553b213d1a926a4157ed63b01200a32d 100644 (file)
--- a/retrace/d3dretrace_main.cpp
+++ b/retrace/d3dretrace_main.cpp
@@ -27,77 +27,35 @@
 #include <string.h>
 
 #include "os_string.hpp"
+
+#include "d3dstate.hpp"
 #include "retrace.hpp"
 #include "d3dretrace.hpp"
 
 
-namespace d3dretrace {
-
-static void display(void) {
-    retrace::Retracer retracer;
-
-    retracer.addCallbacks(d3d9_callbacks);
-
-    trace::Call *call;
-
-    while ((call = retrace::parser.parse_call())) {
-        retracer.retrace(*call);
-
-        delete call;
-    }
-
-    exit(0);
+void
+retrace::setUp(void) {
 }
 
 
-static void usage(void) {
-    std::cout << 
-        "Usage: d3dretrace [OPTION] TRACE\n"
-        "Replay TRACE.\n"
-        "\n"
-        "  -v           increase output verbosity\n"
-    ;
-}
-
-
-extern "C"
-int main(int argc, char **argv)
+void
+retrace::addCallbacks(retrace::Retracer &retracer)
 {
+    retracer.addCallbacks(d3dretrace::d3d8_callbacks);
+    retracer.addCallbacks(d3dretrace::d3d9_callbacks);
+    retracer.addCallbacks(d3dretrace::dxgi_callbacks);
+}
 
-    int i;
-    for (i = 1; i < argc; ++i) {
-        const char *arg = argv[i];
-
-        if (arg[0] != '-') {
-            break;
-        }
-
-        if (!strcmp(arg, "--")) {
-            break;
-        } else if (!strcmp(arg, "--help")) {
-            usage();
-            return 0;
-        } else if (!strcmp(arg, "-v")) {
-            ++retrace::verbosity;
-        } else {
-            std::cerr << "error: unknown option " << arg << "\n";
-            usage();
-            return 1;
-        }
-    }
-
-    for ( ; i < argc; ++i) {
-        if (!retrace::parser.open(argv[i])) {
-            std::cerr << "error: failed to open " << argv[i] << "\n";
-            return 1;
-        }
-
-        display();
 
-        retrace::parser.close();
-    }
+void
+retrace::flushRendering(void) {
+}
 
-    return 0;
+void
+retrace::waitForInput(void) {
+    /* TODO */
 }
 
-} /* namespace glretrace */
+void
+retrace::cleanUp(void) {
+}