Human legible d3d9 error messages.

diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
index 8cc9cd8f2d17dbbcfe17b34f297165b703de8a5d..fe9191bf4841cbd37e785cd3f309fd1939f1bfa1 100644 (file)
--- a/retrace/CMakeLists.txt
+++ b/retrace/CMakeLists.txt
@@ -147,6 +147,7 @@ if (WIN32 AND DirectX_D3DX9_INCLUDE_DIR)
         common
         ${ZLIB_LIBRARIES}
         ${SNAPPY_LIBRARIES}
+        dxerr9
     )
     
     install (TARGETS d3dretrace RUNTIME DESTINATION bin) 

diff --git a/retrace/d3dretrace.py b/retrace/d3dretrace.py
index 4a78e96a7206b4c7def25ca13e3ba848802b48f7..46baf6d27472a0c1eb39bf8226ff7ad3e6db0c25 100644 (file)
--- a/retrace/d3dretrace.py
+++ b/retrace/d3dretrace.py
@@ -61,8 +61,9 @@ class D3DRetracer(Retracer):
         Retracer.invokeInterfaceMethod(self, interface, method)
 
         if str(method.type) == 'HRESULT':
-            print r'    if (_result != S_OK) {'
-            print r'        retrace::warning(call) << "failed\n";'
+            print r'    if (FAILED(_result)) {'
+            print r'        retrace::warning(call) << DXGetErrorString9(_result) << ": " << DXGetErrorDescription9(_result) << "\n";'
+            print r'        return;'
             print r'    }'
 
         if interface.name in self.bufferInterfaceNames and method.name == 'Lock':
@@ -85,6 +86,7 @@ if __name__ == '__main__':
 #include <iostream>
 
 #include "d3d9imports.hpp"
+#include <dxerr9.h>
 #include "d3dretrace.hpp"