fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 13:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium/tessellator: Fix warning suppression

Browse source 
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>
(cherry picked from commit 3c7062417b)
This commit is contained in:
James Park 2020-12-14 11:35:13 -08:00 • committed by Dylan Baker
parent cdebbc1846
commit b913f2b097
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1381,7 +1381,7 @@
"description": "gallium/tessellator: Fix warning suppression",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "790516db0bfc056df0290c42565214d4148e901a"
},

12
src/gallium/auxiliary/tessellator/tessellator.cpp
View file

@ -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.