gallium/tessellator: Fix warning suppression

Single-line version of MSVC warning suppression does not extend beyond
the #endif directive. Use push/disable/pop instead.

Also suppress 26452, which is a similar analysis warning.

This could also be fixed with constexpr if, but C++17 would be required.

Fixes: 790516db0b ("gallium/swr: fix gcc warnings")
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8093>
This commit is contained in:
James Park
2020-12-14 11:35:13 -08:00
committed by Marge Bot
parent 4fec6c9448
commit 3c7062417b
@@ -194,9 +194,13 @@ INT32 floatToIDotF( const float& input )
{
// assert( iShift < 32 );
#if defined(_MSC_VER)
#pragma warning( suppress : 4293 )
#pragma warning( push )
#pragma warning( disable : 4293 26452 )
#endif
_fxpMaxPosValueFloat -= INT32( 1 ) << iShift;
#if defined(_MSC_VER)
#pragma warning( pop )
#endif
}
// The maximum negative fixed point value is -2^(i-1).
@@ -216,9 +220,13 @@ INT32 floatToIDotF( const float& input )
{
// assert( iShift < 32 );
#if defined(_MSC_VER)
#pragma warning( suppress : 4293 )
#pragma warning( push )
#pragma warning( disable : 4293 26452 )
#endif
_fxpMaxPosValueFloat -= INT32( 1 ) << iShift;
#if defined(_MSC_VER)
#pragma warning( pop )
#endif
}
// The maximum negative fixed point value is 0.