Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-14 14:10:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Silenced some warnings when using Intel C++ compiler

Browse Source
This commit is contained in:
Chuck Walbourn 2018-06-05 14:34:26 -07:00
parent 62ff7da94b
commit f6506c1216
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DirectXTex/BC6HBC7.cpp
View File

@ -1664,12 +1664,12 @@ void D3DX_BC6H::Decode(bool bSigned, HDRColorA* pOut) const
if (ms_aModeToInfo[uMode] >= 0) if (ms_aModeToInfo[uMode] >= 0)
{ {
assert(ms_aModeToInfo[uMode] < ARRAYSIZE(ms_aInfo)); assert(static_cast<unsigned int>(ms_aModeToInfo[uMode]) < _countof(ms_aInfo));
_Analysis_assume_(ms_aModeToInfo[uMode] < ARRAYSIZE(ms_aInfo)); _Analysis_assume_(ms_aModeToInfo[uMode] < _countof(ms_aInfo));
const ModeDescriptor* desc = ms_aDesc[ms_aModeToInfo[uMode]]; const ModeDescriptor* desc = ms_aDesc[ms_aModeToInfo[uMode]];
assert(ms_aModeToInfo[uMode] < ARRAYSIZE(ms_aDesc)); assert(static_cast<unsigned int>(ms_aModeToInfo[uMode]) < _countof(ms_aDesc));
_Analysis_assume_(ms_aModeToInfo[uMode] < ARRAYSIZE(ms_aDesc)); _Analysis_assume_(ms_aModeToInfo[uMode] < _countof(ms_aDesc));
const ModeInfo& info = ms_aInfo[ms_aModeToInfo[uMode]]; const ModeInfo& info = ms_aInfo[ms_aModeToInfo[uMode]];
INTEndPntPair aEndPts[BC6H_MAX_REGIONS] = {}; INTEndPntPair aEndPts[BC6H_MAX_REGIONS] = {};

5
DirectXTex/DirectXTexP.h
View File

@ -42,6 +42,11 @@
// C4986 exception specification does not match previous declaration // C4986 exception specification does not match previous declaration
// C5029 nonstandard extension used // C5029 nonstandard extension used
#ifdef __INTEL_COMPILER
#pragma warning(disable : 161)
// warning #161: unrecognized #pragma
#endif
#pragma warning(push) #pragma warning(push)
#pragma warning(disable : 4005) #pragma warning(disable : 4005)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN