X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace%2Fdxgiretrace.py;h=6cd285d23b3001dc34a234a1610fdb7cacee7e9e;hb=c037ae2b4f749aed15ede635a6b517534bc5a901;hp=8de3c989efa5f46057c6b04c19cbee22665af4f0;hpb=9db16b3989481f8d6dfc8932d760fcc16217ecbd;p=apitrace diff --git a/retrace/dxgiretrace.py b/retrace/dxgiretrace.py index 8de3c98..6cd285d 100644 --- a/retrace/dxgiretrace.py +++ b/retrace/dxgiretrace.py @@ -29,6 +29,7 @@ import sys from dllretrace import DllRetracer as Retracer +import specs.dxgi from specs.stdapi import API from specs.dxgi import dxgi from specs.d3d10 import d3d10 @@ -45,13 +46,11 @@ class D3DRetracer(Retracer): print r''' static void createWindow(DXGI_SWAP_CHAIN_DESC *pSwapChainDesc) { - if (pSwapChainDesc->Windowed) { - UINT Width = pSwapChainDesc->BufferDesc.Width; - UINT Height = pSwapChainDesc->BufferDesc.Height; - if (!Width) Width = 1024; - if (!Height) Height = 768; - pSwapChainDesc->OutputWindow = d3dretrace::createWindow(Width, Height); - } + UINT Width = pSwapChainDesc->BufferDesc.Width; + UINT Height = pSwapChainDesc->BufferDesc.Height; + if (!Width) Width = 1024; + if (!Height) Height = 768; + pSwapChainDesc->OutputWindow = d3dretrace::createWindow(Width, Height); } ''' @@ -96,7 +95,16 @@ createWindow(DXGI_SWAP_CHAIN_DESC *pSwapChainDesc) { # Toggle debugging print r' Flags &= ~D3D11_CREATE_DEVICE_DEBUG;' print r' if (retrace::debug) {' - print r' if (LoadLibraryA("d3d11sdklayers")) {' + print r' OSVERSIONINFO osvi;' + print r' BOOL bIsWindows8orLater;' + print r' ZeroMemory(&osvi, sizeof osvi);' + print r' osvi.dwOSVersionInfoSize = sizeof osvi;' + print r' GetVersionEx(&osvi);' + print r' bIsWindows8orLater = ' + print r' (osvi.dwMajorVersion > 6) ||' + print r' (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion >= 2);' + print r' const char *szD3d11SdkLayers = bIsWindows8orLater ? "d3d11_1sdklayers" : "d3d11sdklayers";' + print r' if (LoadLibraryA(szD3d11SdkLayers)) {' print r' Flags |= D3D11_CREATE_DEVICE_DEBUG;' print r' }' print r' }' @@ -106,6 +114,33 @@ createWindow(DXGI_SWAP_CHAIN_DESC *pSwapChainDesc) { Retracer.invokeFunction(self, function) + # Debug layers with Windows 8 or Windows 7 Platform update are a mess. + # It's not possible to know before hand whether they are or not + # available, so always retry with debug flag off.. + if function.name in self.createDeviceFunctionNames: + print r' if (FAILED(_result)) {' + + if function.name.startswith('D3D10CreateDevice'): + print r' if (_result == E_FAIL && (Flags & D3D10_CREATE_DEVICE_DEBUG)) {' + print r' retrace::warning(call) << "debug layer (d3d10sdklayers.dll) not installed\n";' + print r' Flags &= ~D3D10_CREATE_DEVICE_DEBUG;' + Retracer.invokeFunction(self, function) + print r' }' + elif function.name.startswith('D3D11CreateDevice'): + print r' if (_result == E_FAIL && (Flags & D3D11_CREATE_DEVICE_DEBUG)) {' + print r' retrace::warning(call) << "debug layer (d3d11sdklayers.dll for Windows 7, d3d11_1sdklayers.dll for Windows 8 or Windows 7 with KB 2670838) not properly installed\n";' + print r' Flags &= ~D3D11_CREATE_DEVICE_DEBUG;' + Retracer.invokeFunction(self, function) + print r' }' + else: + assert False + + print r' if (FAILED(_result)) {' + print r' exit(1);' + print r' }' + + print r' }' + def forceDriver(self, enum): # This can only work when pAdapter is NULL. For non-NULL pAdapter we # need to override inside the EnumAdapters call below @@ -154,14 +189,30 @@ createWindow(DXGI_SWAP_CHAIN_DESC *pSwapChainDesc) { # keep track of the last used device for state dumping if interface.name in ('ID3D10Device', 'ID3D10Device1'): if method.name == 'Release': - print r' d3d10Dumper.unbindDevice(_this);' + print r' if (call.ret->toUInt() == 0) {' + print r' d3d10Dumper.unbindDevice(_this);' + print r' }' else: print r' d3d10Dumper.bindDevice(_this);' - if interface.name in ('ID3D11DeviceContext',): + if interface.name in ('ID3D11DeviceContext', 'ID3D11DeviceContext1'): if method.name == 'Release': - print r' d3d11Dumper.unbindDevice(_this);' + print r' if (call.ret->toUInt() == 0) {' + print r' d3d11Dumper.unbindDevice(_this);' + print r' }' else: - print r' d3d11Dumper.bindDevice(_this);' + print r' if (_this->GetType() == D3D11_DEVICE_CONTEXT_IMMEDIATE) {' + print r' d3d11Dumper.bindDevice(_this);' + print r' }' + + if interface.name == 'IDXGIFactory' and method.name == 'QueryInterface': + print r' if (riid == IID_IDXGIFactoryDWM) {' + print r' _this->AddRef();' + print r' *ppvObj = new d3dretrace::CDXGIFactoryDWM(_this);' + print r' _result = S_OK;' + print r' } else {' + Retracer.invokeInterfaceMethod(self, interface, method) + print r' }' + return # create windows as neccessary if method.name == 'CreateSwapChain': @@ -205,6 +256,46 @@ createWindow(DXGI_SWAP_CHAIN_DESC *pSwapChainDesc) { print r' }' return + if interface.name.startswith('ID3D10Device') and method.name == 'OpenSharedResource': + print r' retrace::warning(call) << "replacing shared resource with checker pattern\n";' + print r' D3D10_TEXTURE2D_DESC Desc;' + print r' memset(&Desc, 0, sizeof Desc);' + print r' Desc.Width = 8;' + print r' Desc.Height = 8;' + print r' Desc.MipLevels = 1;' + print r' Desc.ArraySize = 1;' + print r' Desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM;' + print r' Desc.SampleDesc.Count = 1;' + print r' Desc.SampleDesc.Quality = 0;' + print r' Desc.Usage = D3D10_USAGE_DEFAULT;' + print r' Desc.BindFlags = D3D10_BIND_SHADER_RESOURCE | D3D10_BIND_RENDER_TARGET;' + print r' Desc.CPUAccessFlags = 0x0;' + print r' Desc.MiscFlags = 0 /* D3D10_RESOURCE_MISC_SHARED */;' + print r''' + const DWORD Checker[8][8] = { + { 0, ~0, 0, ~0, 0, ~0, 0, ~0, }, + {~0, 0, ~0, 0, ~0, 0, ~0, 0, }, + { 0, ~0, 0, ~0, 0, ~0, 0, ~0, }, + {~0, 0, ~0, 0, ~0, 0, ~0, 0, }, + { 0, ~0, 0, ~0, 0, ~0, 0, ~0, }, + {~0, 0, ~0, 0, ~0, 0, ~0, 0, }, + { 0, ~0, 0, ~0, 0, ~0, 0, ~0, }, + {~0, 0, ~0, 0, ~0, 0, ~0, 0, } + }; + const D3D10_SUBRESOURCE_DATA InitialData = {Checker, sizeof Checker[0], sizeof Checker}; + ''' + print r' _result = _this->CreateTexture2D(&Desc, &InitialData, (ID3D10Texture2D**)ppResource);' + self.checkResult(method.type) + return + + if method.name == 'Map': + # Reset _DO_NOT_WAIT flags. Otherwise they may fail, and we have no + # way to cope with it (other than retry). + mapFlagsArg = method.getArgByName('MapFlags') + for flag in mapFlagsArg.type.values: + if flag.endswith('_MAP_FLAG_DO_NOT_WAIT'): + print r' MapFlags &= ~%s;' % flag + Retracer.invokeInterfaceMethod(self, interface, method) # process events after presents @@ -212,11 +303,11 @@ createWindow(DXGI_SWAP_CHAIN_DESC *pSwapChainDesc) { print r' d3dretrace::processEvents();' if method.name == 'Map': - print ' VOID *_pbData = NULL;' - print ' size_t _MappedSize = 0;' - print ' _getMapInfo(_this, %s, _pbData, _MappedSize);' % ', '.join(method.argNames()) - print ' if (_MappedSize) {' - print ' _maps[_this] = _pbData;' + print ' _MAP_DESC _MapDesc;' + print ' _getMapDesc(_this, %s, _MapDesc);' % ', '.join(method.argNames()) + print ' size_t _MappedSize = _MapDesc.Size;' + print ' if (_MapDesc.Size) {' + print ' _maps[_this] = _MapDesc.pData;' print ' } else {' print ' return;' print ' }' @@ -239,6 +330,8 @@ createWindow(DXGI_SWAP_CHAIN_DESC *pSwapChainDesc) { def main(): + print r'#define INITGUID' + print print r'#include ' print print r'#include ' @@ -251,6 +344,7 @@ def main(): api = API() if moduleNames: + print r'#include "d3dretrace_dxgi.hpp"' api.addModule(dxgi) if 'd3d10' in moduleNames: