diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2016-09-21 11:53:32 +0100 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2016-09-21 11:53:32 +0100 |
| commit | 59334923bff2c8666bf181a94f941cc0fb451a15 (patch) | |
| tree | 37381382e73e131777b63c3ee01d51700cf592d3 | |
| parent | 23b38ea378b3ae0da46d2d4218adf6d4df122b8f (diff) | |
d3dretrace: Don't duplicate ATI1/ATI2 FourCC defines.
"ATI1N"/"ATI2N" is how these texture formats are described in AMD's
"Advanced DX9 Capabilities for ATI Radeon Cards" document.
g test.sh
| -rw-r--r-- | dispatch/d3d9imports.hpp | 8 | ||||
| -rw-r--r-- | retrace/d3d9state_formats.cpp | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/dispatch/d3d9imports.hpp b/dispatch/d3d9imports.hpp index 7aee055f..061e2be6 100644 --- a/dispatch/d3d9imports.hpp +++ b/dispatch/d3d9imports.hpp @@ -88,14 +88,6 @@ #define RESZ_CODE 0x7fa05000 #endif -#ifndef D3DFMT_ATI1 -#define D3DFMT_ATI1 ((D3DFORMAT)MAKEFOURCC('A','T','I','1')) -#endif - -#ifndef D3DFMT_ATI2 -#define D3DFMT_ATI2 ((D3DFORMAT)MAKEFOURCC('A','T','I','2')) -#endif - #ifndef D3DUSAGE_TEXTAPI #define D3DUSAGE_TEXTAPI 0x10000000L #endif diff --git a/retrace/d3d9state_formats.cpp b/retrace/d3d9state_formats.cpp index 1681011b..5daac901 100644 --- a/retrace/d3d9state_formats.cpp +++ b/retrace/d3d9state_formats.cpp @@ -108,8 +108,8 @@ formatToString(D3DFORMAT fmt) case D3DFMT_A1: return "D3DFMT_A1"; case D3DFMT_A2B10G10R10_XR_BIAS: return "D3DFMT_A2B10G10R10_XR_BIAS"; case D3DFMT_BINARYBUFFER: return "D3DFMT_BINARYBUFFER"; - case D3DFMT_ATI1: return "D3DFMT_ATI1"; - case D3DFMT_ATI2: return "D3DFMT_ATI2"; + case D3DFMT_ATI1N: return "D3DFMT_ATI1N"; + case D3DFMT_ATI2N: return "D3DFMT_ATI2N"; case D3DFMT_DF16: return "D3DFMT_DF16"; case D3DFMT_DF24: return "D3DFMT_DF24"; case D3DFMT_INTZ: return "D3DFMT_INTZ"; |