diff --git a/3rdparty/dxsdk/include/dxgitype.h b/3rdparty/dxsdk/include/dxgitype.h index 32a835dc..28b706fc 100644 --- a/3rdparty/dxsdk/include/dxgitype.h +++ b/3rdparty/dxsdk/include/dxgitype.h @@ -10,29 +10,29 @@ #define MAKE_DXGI_HRESULT(code) MAKE_HRESULT(1, _FACDXGI, code) #define MAKE_DXGI_STATUS(code) MAKE_HRESULT(0, _FACDXGI, code) -#if defined(__MINGW32__) || (_WIN32_WINNT <= _WIN32_WINNT_WIN7) -#define DXGI_STATUS_OCCLUDED MAKE_DXGI_STATUS(1) -#define DXGI_STATUS_CLIPPED MAKE_DXGI_STATUS(2) -#define DXGI_STATUS_NO_REDIRECTION MAKE_DXGI_STATUS(4) -#define DXGI_STATUS_NO_DESKTOP_ACCESS MAKE_DXGI_STATUS(5) -#define DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_STATUS(6) -#define DXGI_STATUS_MODE_CHANGED MAKE_DXGI_STATUS(7) -#define DXGI_STATUS_MODE_CHANGE_IN_PROGRESS MAKE_DXGI_STATUS(8) -#define DXGI_ERROR_INVALID_CALL MAKE_DXGI_HRESULT(1) -#define DXGI_ERROR_NOT_FOUND MAKE_DXGI_HRESULT(2) -#define DXGI_ERROR_MORE_DATA MAKE_DXGI_HRESULT(3) -#define DXGI_ERROR_UNSUPPORTED MAKE_DXGI_HRESULT(4) -#define DXGI_ERROR_DEVICE_REMOVED MAKE_DXGI_HRESULT(5) -#define DXGI_ERROR_DEVICE_HUNG MAKE_DXGI_HRESULT(6) -#define DXGI_ERROR_DEVICE_RESET MAKE_DXGI_HRESULT(7) -#define DXGI_ERROR_WAS_STILL_DRAWING MAKE_DXGI_HRESULT(10) -#define DXGI_ERROR_FRAME_STATISTICS_DISJOINT MAKE_DXGI_HRESULT(11) -#define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_HRESULT(12) -#define DXGI_ERROR_DRIVER_INTERNAL_ERROR MAKE_DXGI_HRESULT(32) -#define DXGI_ERROR_NONEXCLUSIVE MAKE_DXGI_HRESULT(33) -#define DXGI_ERROR_NOT_CURRENTLY_AVAILABLE MAKE_DXGI_HRESULT(34) -#define DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED MAKE_DXGI_HRESULT(35) -#define DXGI_ERROR_REMOTE_OUTOFMEMORY MAKE_DXGI_HRESULT(36) +#if defined(__MINGW32__) || !defined(DXGI_ERROR_INVALID_CALL) +# define DXGI_STATUS_OCCLUDED MAKE_DXGI_STATUS(1) +# define DXGI_STATUS_CLIPPED MAKE_DXGI_STATUS(2) +# define DXGI_STATUS_NO_REDIRECTION MAKE_DXGI_STATUS(4) +# define DXGI_STATUS_NO_DESKTOP_ACCESS MAKE_DXGI_STATUS(5) +# define DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_STATUS(6) +# define DXGI_STATUS_MODE_CHANGED MAKE_DXGI_STATUS(7) +# define DXGI_STATUS_MODE_CHANGE_IN_PROGRESS MAKE_DXGI_STATUS(8) +# define DXGI_ERROR_INVALID_CALL MAKE_DXGI_HRESULT(1) +# define DXGI_ERROR_NOT_FOUND MAKE_DXGI_HRESULT(2) +# define DXGI_ERROR_MORE_DATA MAKE_DXGI_HRESULT(3) +# define DXGI_ERROR_UNSUPPORTED MAKE_DXGI_HRESULT(4) +# define DXGI_ERROR_DEVICE_REMOVED MAKE_DXGI_HRESULT(5) +# define DXGI_ERROR_DEVICE_HUNG MAKE_DXGI_HRESULT(6) +# define DXGI_ERROR_DEVICE_RESET MAKE_DXGI_HRESULT(7) +# define DXGI_ERROR_WAS_STILL_DRAWING MAKE_DXGI_HRESULT(10) +# define DXGI_ERROR_FRAME_STATISTICS_DISJOINT MAKE_DXGI_HRESULT(11) +# define DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE MAKE_DXGI_HRESULT(12) +# define DXGI_ERROR_DRIVER_INTERNAL_ERROR MAKE_DXGI_HRESULT(32) +# define DXGI_ERROR_NONEXCLUSIVE MAKE_DXGI_HRESULT(33) +# define DXGI_ERROR_NOT_CURRENTLY_AVAILABLE MAKE_DXGI_HRESULT(34) +# define DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED MAKE_DXGI_HRESULT(35) +# define DXGI_ERROR_REMOTE_OUTOFMEMORY MAKE_DXGI_HRESULT(36) #endif // defined(__MINGW32__) || (_WIN32_WINNT < 0x0601) #define DXGI_CPU_ACCESS_NONE ( 0 )