mirror of
https://github.com/minetest/irrlicht.git
synced 2024-11-16 15:30:25 +01:00
Work on IRRLICHT_FAST_MATH troubles. Document round_ and round32 troubles.
- Add warnings to round_, round32 about different (and sometimes worse) behavior than the standard library, especially at high numbers. For example with input 8388609 standard library corrrectly returns 8388609, but we get 8388610. But as we still don't use C99/c++11 in Irrlicht 1.9 I have no easy way to fix this. - reciprocal_squareroot with IRRLICHT_FAST_MATH is less exact than it claims to be. Just commenting it. - document slightly different behavior of reciprocal with IRRLICHT_FAST_MATH around 0. - Kick out IRRLICHT_FAST_MATH for floor32, ceil32, round32. Their results are simply wrong, especially for uneven numbers. Like floor32(1) will be 0. or ceil32(-1) will also be 0. round32 wasn't as bad, but also down-rounding 0.5 and less exact. I know Burnings still wants those functions, so next commmit will add them again, but with new names and only an internal header. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6011 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
parent
79800125ae
commit
3acf725ae3
|
@ -483,6 +483,9 @@ namespace core
|
||||||
state ^= ( ( -condition >> 31 ) ^ state ) & mask;
|
state ^= ( ( -condition >> 31 ) ^ state ) & mask;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NOTE: This is not as exact as the c99/c++11 round function, especially at high numbers starting with 8388609
|
||||||
|
// (only low number which seems to go wrong is 0.49999997 which is rounded to 1)
|
||||||
|
// Also negative 0.5 is rounded up not down unlike with the standard function (p.E. input -0.5 will be 0 and not -1)
|
||||||
inline f32 round_( f32 x )
|
inline f32 round_( f32 x )
|
||||||
{
|
{
|
||||||
return floorf( x + 0.5f );
|
return floorf( x + 0.5f );
|
||||||
|
@ -524,6 +527,9 @@ namespace core
|
||||||
REALINLINE f32 reciprocal_squareroot(const f32 f)
|
REALINLINE f32 reciprocal_squareroot(const f32 f)
|
||||||
{
|
{
|
||||||
#if defined ( IRRLICHT_FAST_MATH )
|
#if defined ( IRRLICHT_FAST_MATH )
|
||||||
|
// NOTE: Unlike comment below says I found inaccuracies already at 4'th significant bit.
|
||||||
|
// p.E: Input 1, expected 1, got 0.999755859
|
||||||
|
|
||||||
#if defined(_MSC_VER) && !defined(_WIN64)
|
#if defined(_MSC_VER) && !defined(_WIN64)
|
||||||
// SSE reciprocal square root estimate, accurate to 12 significant
|
// SSE reciprocal square root estimate, accurate to 12 significant
|
||||||
// bits of the mantissa
|
// bits of the mantissa
|
||||||
|
@ -556,6 +562,7 @@ namespace core
|
||||||
REALINLINE f32 reciprocal( const f32 f )
|
REALINLINE f32 reciprocal( const f32 f )
|
||||||
{
|
{
|
||||||
#if defined (IRRLICHT_FAST_MATH)
|
#if defined (IRRLICHT_FAST_MATH)
|
||||||
|
// NOTE: Unlike with 1.f / f the values very close to 0 return -nan instead of inf
|
||||||
|
|
||||||
// SSE Newton-Raphson reciprocal estimate, accurate to 23 significant
|
// SSE Newton-Raphson reciprocal estimate, accurate to 23 significant
|
||||||
// bi ts of the mantissa
|
// bi ts of the mantissa
|
||||||
|
@ -638,94 +645,18 @@ namespace core
|
||||||
|
|
||||||
REALINLINE s32 floor32(f32 x)
|
REALINLINE s32 floor32(f32 x)
|
||||||
{
|
{
|
||||||
#ifdef IRRLICHT_FAST_MATH
|
|
||||||
const f32 h = 0.5f;
|
|
||||||
|
|
||||||
s32 t;
|
|
||||||
|
|
||||||
#if defined(_MSC_VER) && !defined(_WIN64)
|
|
||||||
__asm
|
|
||||||
{
|
|
||||||
fld x
|
|
||||||
fsub h
|
|
||||||
fistp t
|
|
||||||
}
|
|
||||||
#elif defined(__GNUC__)
|
|
||||||
__asm__ __volatile__ (
|
|
||||||
"fsub %2 \n\t"
|
|
||||||
"fistpl %0"
|
|
||||||
: "=m" (t)
|
|
||||||
: "t" (x), "f" (h)
|
|
||||||
: "st"
|
|
||||||
);
|
|
||||||
#else
|
|
||||||
return (s32) floorf ( x );
|
return (s32) floorf ( x );
|
||||||
#endif
|
|
||||||
return t;
|
|
||||||
#else // no fast math
|
|
||||||
return (s32) floorf ( x );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
REALINLINE s32 ceil32 ( f32 x )
|
REALINLINE s32 ceil32 ( f32 x )
|
||||||
{
|
{
|
||||||
#ifdef IRRLICHT_FAST_MATH
|
|
||||||
const f32 h = 0.5f;
|
|
||||||
|
|
||||||
s32 t;
|
|
||||||
|
|
||||||
#if defined(_MSC_VER) && !defined(_WIN64)
|
|
||||||
__asm
|
|
||||||
{
|
|
||||||
fld x
|
|
||||||
fadd h
|
|
||||||
fistp t
|
|
||||||
}
|
|
||||||
#elif defined(__GNUC__)
|
|
||||||
__asm__ __volatile__ (
|
|
||||||
"fadd %2 \n\t"
|
|
||||||
"fistpl %0 \n\t"
|
|
||||||
: "=m"(t)
|
|
||||||
: "t"(x), "f"(h)
|
|
||||||
: "st"
|
|
||||||
);
|
|
||||||
#else
|
|
||||||
return (s32) ceilf ( x );
|
return (s32) ceilf ( x );
|
||||||
#endif
|
|
||||||
return t;
|
|
||||||
#else // not fast math
|
|
||||||
return (s32) ceilf ( x );
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NOTE: Please check round_ documentation about some inaccuracies in this compared to standard library round function.
|
||||||
|
|
||||||
REALINLINE s32 round32(f32 x)
|
REALINLINE s32 round32(f32 x)
|
||||||
{
|
{
|
||||||
#if defined(IRRLICHT_FAST_MATH)
|
|
||||||
s32 t;
|
|
||||||
|
|
||||||
#if defined(_MSC_VER) && !defined(_WIN64)
|
|
||||||
__asm
|
|
||||||
{
|
|
||||||
fld x
|
|
||||||
fistp t
|
|
||||||
}
|
|
||||||
#elif defined(__GNUC__)
|
|
||||||
__asm__ __volatile__ (
|
|
||||||
"fistpl %0 \n\t"
|
|
||||||
: "=m"(t)
|
|
||||||
: "t"(x)
|
|
||||||
: "st"
|
|
||||||
);
|
|
||||||
#else
|
|
||||||
return (s32) round_(x);
|
return (s32) round_(x);
|
||||||
#endif
|
|
||||||
return t;
|
|
||||||
#else // no fast math
|
|
||||||
return (s32) round_(x);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
inline f32 f32_max3(const f32 a, const f32 b, const f32 c)
|
inline f32 f32_max3(const f32 a, const f32 b, const f32 c)
|
||||||
|
@ -752,4 +683,3 @@ namespace core
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user