d3dretrace: Merge d3d9 and d3d10 retracing.

diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
index e6c8de0dfa8408132518a739da275257b2fb71d9..5a46d3e8c578315dff3d6fb11532ba4f856c1e4e 100644 (file)
--- 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 4724c17ef37c94afa7accff06861c1af70104c69..4b5853bdd3e2be3e0b987cbe2c9a9daf4b429a61 100644 (file)
--- 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 9cd5da51f579cad0011edc22e80aa7071a351862..e939ddfd6ce3e0ec67eb177c27f96e2db39295ac 100644 (file)
--- 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 1ce7b580e06f65170f7809543a3b0054ebd9710a..5a45d36191b431fe0d5f3c2938781125ac940238 100644 (file)
--- 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 3308b58cf5d9c52a809ebba5dd08a23a9f70558c..440d5b1504fed80a0ea6b72e7abb2e6ac849eee4 100644 (file)
--- 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);
 }