From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 16 Sep 2013 13:58:34 +0000 (+0100)
Subject: d3dretrace: Make --driver work correctly on DXGI1.1
X-Git-Url: https://git.cworth.org/git?p=apitrace;a=commitdiff_plain;h=a06b851d9e29f51bd194ac15d50abc302ac27cd0

d3dretrace: Make --driver work correctly on DXGI1.1

Need to intercept IDXGIFactory1::EnumAdapters1 too.
---

diff --git a/retrace/dxgiretrace.py b/retrace/dxgiretrace.py
old mode 100644
new mode 100755
index 6cd285d..8fa1fdb
--- a/retrace/dxgiretrace.py
+++ b/retrace/dxgiretrace.py
@@ -229,7 +229,7 @@ createWindow(DXGI_SWAP_CHAIN_DESC *pSwapChainDesc) {
             print r'    }'
 
         # Force driver
-        if interface.name.startswith('IDXGIFactory') and method.name == 'EnumAdapters':
+        if interface.name.startswith('IDXGIFactory') and method.name.startswith('EnumAdapters'):
             print r'    const char *szSoftware = NULL;'
             print r'    switch (retrace::driver) {'
             print r'    case retrace::DRIVER_REFERENCE:'
@@ -250,7 +250,7 @@ createWindow(DXGI_SWAP_CHAIN_DESC *pSwapChainDesc) {
             print r'        }'
             print r'    }'
             print r'    if (hSoftware) {'
-            print r'        _result = _this->CreateSoftwareAdapter(hSoftware, ppAdapter);'
+            print r'        _result = _this->CreateSoftwareAdapter(hSoftware, reinterpret_cast<IDXGIAdapter **>(ppAdapter));'
             print r'    } else {'
             Retracer.invokeInterfaceMethod(self, interface, method)
             print r'    }'