Module: Mesa Branch: master Commit: 3c7062417bedb203a0a58e27e85febd55c75cbce URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3c7062417bedb203a0a58e27e85febd55c75cbce
Author: James Park <[email protected]> Date: Mon Dec 14 11:35:13 2020 -0800 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: 790516db0bf ("gallium/swr: fix gcc warnings") Reviewed-by: Jesse Natalie <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8093> --- src/gallium/auxiliary/tessellator/tessellator.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/tessellator/tessellator.cpp b/src/gallium/auxiliary/tessellator/tessellator.cpp index 7452ec6cb44..91a5390278d 100644 --- a/src/gallium/auxiliary/tessellator/tessellator.cpp +++ b/src/gallium/auxiliary/tessellator/tessellator.cpp @@ -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. _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
