Don't retrace calls that failed when tracing.

[apitrace] / retrace / d3dretrace.py

diff --git a/retrace/d3dretrace.py b/retrace/d3dretrace.py
index ca936f2556ce0f38d4f5cd537957b05ae9662a00..a04e01def391870b815a68ff54884f3685561f0d 100644 (file)
--- a/retrace/d3dretrace.py
+++ b/retrace/d3dretrace.py
@@ -24,34 +24,61 @@
 ##########################################################################/
 
 
-"""GL retracer generator."""
+"""D3D retracer generator."""
 
 
 from dllretrace import DllRetracer as Retracer
 import specs.stdapi as stdapi
-from specs.d3d9 import d3d9
+from specs.d3d9 import *
 
 
 class D3DRetracer(Retracer):
 
     table_name = 'd3dretrace::d3d9_callbacks'
 
+    bufferInterfaceNames = [
+        'IDirect3DVertexBuffer9',
+        'IDirect3DIndexBuffer9',
+    ]
+
+    def extractArg(self, function, arg, arg_type, lvalue, rvalue):
+        if arg.type is D3DSHADER9:
+            print r'    %s = extractShader((%s).toString());' % (lvalue, rvalue)
+            print r'    if (!%s) {' % lvalue
+            print r'        retrace::warning(call) << "failed to assemble shader\n";'
+            print r'        return;'
+            print r'    }'
+            return
+            
+        Retracer.extractArg(self, function, arg, arg_type, lvalue, rvalue)
+
     def invokeInterfaceMethod(self, interface, method):
-        if interface.name == 'IDirect3D9' and method.name == 'CreateDevice':
-            print 'HWND hWnd = createWindow(pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight);'
-            print 'pPresentationParameters->hDeviceWindow = hWnd;'
-            print 'hFocusWindow = hWnd;'
+        # keep track of the last used device for state dumping
+        if interface.name in ('IDirect3DDevice9', 'IDirect3DDevice9Ex'):
+            print r'    d3dretrace::pLastDirect3DDevice9 = _this;'
+
+        # create windows as neccessary
+        if method.name in ('CreateDevice', 'CreateDeviceEx'):
+            print r'    HWND hWnd = createWindow(pPresentationParameters->BackBufferWidth, pPresentationParameters->BackBufferHeight);'
+            print r'    hFocusWindow = hWnd;'
+            print r'    pPresentationParameters->hDeviceWindow = hWnd;'
 
         Retracer.invokeInterfaceMethod(self, interface, method)
 
+        # check errors
         if str(method.type) == 'HRESULT':
-            print r'    if (__result != S_OK) {'
+            print r'    if (FAILED(_result)) {'
             print r'        retrace::warning(call) << "failed\n";'
             print r'    }'
 
-        if interface.name == 'IDirect3DVertexBuffer9' and method.name == 'Lock':
+        if interface.name in self.bufferInterfaceNames and method.name == 'Lock':
+            getDescMethod = interface.getMethodByName('GetDesc')
+            descArg = getDescMethod.args[0]
+            assert descArg.output
+            descType = getDescMethod.args[0].type.type
+
             print '        if (!SizeToLock) {'
-            print '            D3DVERTEXBUFFER_DESC Desc;'
+            print '            %s Desc;' % descType
             print '            _this->GetDesc(&Desc);'
             print '            SizeToLock = Desc.Size;'
             print '        }'
@@ -140,6 +167,69 @@ createWindow(int width, int height) {
     return hWnd;
 }
 
+
+
+typedef HRESULT
+(WINAPI *PD3DXASSEMBLESHADER)(
+    LPCSTR pSrcData,
+    UINT SrcDataLen,
+    const D3DXMACRO *pDefines,
+    LPD3DXINCLUDE pInclude,
+    DWORD Flags,
+    LPD3DXBUFFER *ppShader,
+    LPD3DXBUFFER *ppErrorMsgs
+);
+
+DWORD *
+extractShader(LPCSTR pSrcData)
+{
+    static BOOL firsttime = TRUE;
+    static HMODULE hD3DXModule = NULL;
+    static PD3DXASSEMBLESHADER pfnD3DXAssembleShader = NULL;
+
+    if (firsttime) {
+        if (!hD3DXModule) {
+            unsigned release;
+            int version;
+            for (release = 0; release <= 1; ++release) {
+                /* Version 41 corresponds to Mar 2009 version of DirectX Runtime / SDK */
+                for (version = 41; version >= 0; --version) {
+                    char filename[256];
+                    _snprintf(filename, sizeof(filename),
+                              "d3dx9%s%s%u.dll", release ? "" : "d", version ? "_" : "", version);
+                    hD3DXModule = LoadLibraryA(filename);
+                    if (hD3DXModule)
+                        goto found;
+                }
+            }
+found:
+            ;
+        }
+
+        if (hD3DXModule) {
+            if (!pfnD3DXAssembleShader) {
+                pfnD3DXAssembleShader = (PD3DXASSEMBLESHADER)GetProcAddress(hD3DXModule, "D3DXAssembleShader");
+            }
+        }
+
+        firsttime = FALSE;
+    }
+
+    if (pfnD3DXAssembleShader) {
+        LPD3DXBUFFER pTokens = NULL;
+        HRESULT hr;
+
+        hr = pfnD3DXAssembleShader(pSrcData, strlen(pSrcData), NULL, NULL, 0, &pTokens, NULL);
+        if (hr == D3D_OK) {
+            return (DWORD *)pTokens->GetBufferPointer();
+        }
+
+        // FIXME: Don't leak pTokens
+    }
+
+    return NULL;
+}
 '''
+
     retracer = D3DRetracer()
     retracer.retraceApi(d3d9)