diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2017-03-22 14:08:19 +0000 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2017-03-22 14:08:19 +0000 |
| commit | 1e579c41545ac4a7ed5b8dd7fd79dd7dad120558 (patch) | |
| tree | 926fd64329b437bb364405ebbccf863a8f02b046 | |
| parent | 4ef44bf1540754c3e723eacbaae0c69854de315a (diff) | |
compat: Don't redefine D3DERR_* macros.
| -rw-r--r-- | compat/d3derr.hpp | 21 | ||||
| -rwxr-xr-x | retrace/dxgiretrace.py | 1 |
2 files changed, 1 insertions, 21 deletions
diff --git a/compat/d3derr.hpp b/compat/d3derr.hpp index 39ebc9ab..4d949f09 100644 --- a/compat/d3derr.hpp +++ b/compat/d3derr.hpp @@ -41,27 +41,6 @@ #include <windows.h> -#ifndef _FACD3D -#define _FACD3D 0x876 -#endif - -#ifndef MAKE_D3DHRESULT -#define MAKE_D3DHRESULT(code) MAKE_HRESULT(1, _FACD3D, code) -#endif - -#ifndef MAKE_D3DSTATUS -#define MAKE_D3DSTATUS(code) MAKE_HRESULT(0, _FACD3D, code) -#endif - -#ifndef D3DERR_INVALIDCALL -#define D3DERR_INVALIDCALL MAKE_D3DHRESULT(2156) -#endif - -#ifndef D3DERR_WASSTILLDRAWING -#define D3DERR_WASSTILLDRAWING MAKE_D3DHRESULT(540) -#endif - - #ifndef DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED #define DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED MAKE_DXGI_HRESULT(35) #endif diff --git a/retrace/dxgiretrace.py b/retrace/dxgiretrace.py index 12b4ff3b..d6ca7899 100755 --- a/retrace/dxgiretrace.py +++ b/retrace/dxgiretrace.py @@ -427,6 +427,7 @@ def main(): print r'#include "d3d11size.hpp"' print r'#include "dcompimports.hpp"' print r'#include "d3dstate.hpp"' + print r'#include "d3d9imports.hpp" // D3DERR_WASSTILLDRAWING' print print '''static d3dretrace::D3DDumper<IDXGISwapChain> dxgiDumper;''' print '''static d3dretrace::D3DDumper<ID3D10Device> d3d10Dumper;''' |