diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-05-29 10:22:51 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-05-29 10:22:51 +0000 |
| commit | c9223eed3c16cd3e98a8f56dda953d8f299de0e3 (patch) | |
| tree | 53e2a1c3f13bcf6b4ed201d7bc135e7213c94ebe /lib/mesa/include/D3D9 | |
| parent | 6e8f2d062ab9c198239b9283b2b7ed12f4ea17d8 (diff) | |
Import Mesa 11.2.2
Diffstat (limited to 'lib/mesa/include/D3D9')
| -rw-r--r-- | lib/mesa/include/D3D9/d3d9types.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/mesa/include/D3D9/d3d9types.h b/lib/mesa/include/D3D9/d3d9types.h index 52fbc99da..e0b86523d 100644 --- a/lib/mesa/include/D3D9/d3d9types.h +++ b/lib/mesa/include/D3D9/d3d9types.h @@ -178,11 +178,17 @@ typedef struct _RGNDATA { #undef WINAPI #endif /* WINAPI*/ -#if defined(__x86_64__) || defined(_M_X64) -#define WINAPI __attribute__((ms_abi)) -#else /* x86_64 */ -#define WINAPI __attribute__((__stdcall__)) -#endif /* x86_64 */ +#ifdef __GNUC__ + #if (defined(__x86_64__) && !defined(__ILP32__)) || defined(_M_X64) + #define WINAPI __attribute__((ms_abi)) + #elif defined(__i386) || defined(_M_IX86) + #define WINAPI __attribute__((__stdcall__)) + #else /* neither amd64 nor i386 */ + #define WINAPI + #endif +#else /* __GNUC__ */ + #define WINAPI +#endif /* Implementation caps */ #define D3DPRESENT_BACK_BUFFERS_MAX 3 @@ -227,6 +233,7 @@ typedef struct _RGNDATA { #define D3DERR_DRIVERINVALIDCALL MAKE_D3DHRESULT(2157) #define D3DERR_DEVICEREMOVED MAKE_D3DHRESULT(2160) #define D3DERR_DEVICEHUNG MAKE_D3DHRESULT(2164) +#define S_PRESENT_OCCLUDED MAKE_D3DSTATUS(2168) /******************************************************** * Bitmasks * |