From fbcb5d9fc467da2d91b330bfd62f15e7d07ed1c2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jose.r.fonseca@gmail.com>
Date: Tue, 13 Nov 2012 09:28:23 +0000
Subject: [PATCH] d3dretrace: Merge d3d9 and d3d10 retracing.

---
 retrace/CMakeLists.txt      | 48 ++++++++++++++-----------------------
 retrace/d3d9retrace.py      |  2 +-
 retrace/d3dcommonretrace.py | 16 +------------
 retrace/d3dretrace.hpp      |  3 ++-
 retrace/d3dretrace_main.cpp |  3 ++-
 5 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
index e6c8de0..5a46d3e 100644
--- a/retrace/CMakeLists.txt
+++ b/retrace/CMakeLists.txt
@@ -129,6 +129,7 @@ if (ENABLE_EGL AND X11_FOUND AND NOT WIN32 AND NOT APPLE)
 endif ()
 
 if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR)
+    include_directories (SYSTEM ${DirectX_D3DX9_INCLUDE_DIR})
     add_custom_command (
         OUTPUT d3dretrace_d3d9.cpp
         COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9retrace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3dretrace_d3d9.cpp
@@ -144,38 +145,22 @@ if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR)
                 ${CMAKE_SOURCE_DIR}/specs/stdapi.py
     )
 
-    include_directories (SYSTEM ${DirectX_D3DX9_INCLUDE_DIR})
-    add_executable (d3dretrace
-        d3dretrace_main.cpp
-        d3dretrace_d3d9.cpp
-        d3dretrace_ws.cpp
-        d3d9state.cpp
-        d3d9state_images.cpp
-    )
-    target_link_libraries (d3dretrace
-        retrace_common
-    )
-
-    install (TARGETS d3dretrace RUNTIME DESTINATION bin)
-endif ()
-
-if (WIN32 AND DirectX_D3D10_INCLUDE_DIR)
-    include_directories (SYSTEM ${DirectX_D3D10_INCLUDE_DIR})
-    set (MODULES d3d10)
-    
-    if (DirectX_D3D10_1_INCLUDE_DIR)
-        include_directories (SYSTEM ${DirectX_D3D10_1_INCLUDE_DIR})
-        set (MODULES ${MODULES} d3d10_1)
+    if (DirectX_D3D10_INCLUDE_DIR)
+        include_directories (SYSTEM ${DirectX_D3D10_INCLUDE_DIR})
+        set (MODULES d3d10)
+        if (DirectX_D3D10_1_INCLUDE_DIR)
+            include_directories (SYSTEM ${DirectX_D3D10_1_INCLUDE_DIR})
+            set (MODULES ${MODULES} d3d10_1)
+        endif ()
     endif ()
 
     if (DirectX_D3D11_INCLUDE_DIR)
         include_directories (SYSTEM ${DirectX_D3D11_INCLUDE_DIR})
         set (MODULES ${MODULES} d3d11)
-    endif ()
-
-    if (DirectX_D3D11_1_INCLUDE_DIR)
-        include_directories (SYSTEM ${DirectX_D3D11_1_INCLUDE_DIR})
-        set (MODULES ${MODULES} d3d11_1)
+        if (DirectX_D3D11_1_INCLUDE_DIR)
+            include_directories (SYSTEM ${DirectX_D3D11_1_INCLUDE_DIR})
+            set (MODULES ${MODULES} d3d11_1)
+        endif ()
     endif ()
 
     add_custom_command (
@@ -203,14 +188,17 @@ if (WIN32 AND DirectX_D3D10_INCLUDE_DIR)
                 ${CMAKE_SOURCE_DIR}/specs/stdapi.py
     )
 
-    add_executable (d3d10retrace
+    add_executable (d3dretrace
         d3dretrace_main.cpp
+        d3dretrace_d3d9.cpp
         d3dretrace_d3d10.cpp
         d3dretrace_ws.cpp
+        d3d9state.cpp
+        d3d9state_images.cpp
     )
-    target_link_libraries (d3d10retrace
+    target_link_libraries (d3dretrace
         retrace_common
     )
 
-    install (TARGETS d3d10retrace RUNTIME DESTINATION bin)
+    install (TARGETS d3dretrace RUNTIME DESTINATION bin)
 endif ()
diff --git a/retrace/d3d9retrace.py b/retrace/d3d9retrace.py
index 4724c17..4b5853b 100644
--- a/retrace/d3d9retrace.py
+++ b/retrace/d3d9retrace.py
@@ -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)
 
diff --git a/retrace/d3dcommonretrace.py b/retrace/d3dcommonretrace.py
index 9cd5da5..e939ddf 100644
--- a/retrace/d3dcommonretrace.py
+++ b/retrace/d3dcommonretrace.py
@@ -39,25 +39,11 @@ from specs.d3d11 import d3d11
 class D3DRetracer(Retracer):
 
     def retraceApi(self, api):
-        print '''
-image::Image *
-retrace::getSnapshot(void) {
-    return NULL;
-}
-
-
-bool
-retrace::dumpState(std::ostream &os)
-{
-    return false;
-}
-'''
-
         print '// Swizzling mapping for lock addresses'
         print 'static std::map<void *, void *> _maps;'
         print
 
-        self.table_name = 'd3dretrace::d3d_callbacks'
+        self.table_name = 'd3dretrace::d3d10_callbacks'
 
         Retracer.retraceApi(self, api)
 
diff --git a/retrace/d3dretrace.hpp b/retrace/d3dretrace.hpp
index 1ce7b58..5a45d36 100644
--- a/retrace/d3dretrace.hpp
+++ b/retrace/d3dretrace.hpp
@@ -35,7 +35,8 @@
 namespace d3dretrace {
 
 
-extern const retrace::Entry d3d_callbacks[];
+extern const retrace::Entry d3d9_callbacks[];
+extern const retrace::Entry d3d10_callbacks[];
 
 
 HWND
diff --git a/retrace/d3dretrace_main.cpp b/retrace/d3dretrace_main.cpp
index 3308b58..440d5b1 100644
--- a/retrace/d3dretrace_main.cpp
+++ b/retrace/d3dretrace_main.cpp
@@ -41,7 +41,8 @@ retrace::setUp(void) {
 void
 retrace::addCallbacks(retrace::Retracer &retracer)
 {
-    retracer.addCallbacks(d3dretrace::d3d_callbacks);
+    retracer.addCallbacks(d3dretrace::d3d9_callbacks);
+    retracer.addCallbacks(d3dretrace::d3d10_callbacks);
 }
 
 
-- 
2.43.0