godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #48903 from Calinou/math-funcs-remove-old-msvc-ifdef

This commit is contained in:
Rémi Verschelde 2021-05-21 00:35:48 +02:00 committed by GitHub
parent 37a417e838 b57d9c8005
commit d5f9f58b61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/math/math_funcs.h
View File

@ -384,28 +384,10 @@ public:
return u.d; return u.d;
} }
//this function should be as fast as possible and rounding mode should not matter // This function should be as fast as possible and rounding mode should not matter.
static _ALWAYS_INLINE_ int fast_ftoi(float a) { static _ALWAYS_INLINE_ int fast_ftoi(float a) {
static int b; // Assuming every supported compiler has `lrint()`.
return lrintf(a);
#if (defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0603) || WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP // windows 8 phone?
b = (int)((a > 0.0) ? (a + 0.5) : (a - 0.5));
#elif defined(_MSC_VER) && _MSC_VER < 1800
__asm fld a __asm fistp b
/*#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) )
// use AT&T inline assembly style, document that
// we use memory as output (=m) and input (m)
__asm__ __volatile__ (
"flds %1 \n\t"
"fistpl %0 \n\t"
: "=m" (b)
: "m" (a));*/
#else
b = lrintf(a); //assuming everything but msvc 2012 or earlier has lrint
#endif
return b;
} }
static _ALWAYS_INLINE_ uint32_t halfbits_to_floatbits(uint16_t h) { static _ALWAYS_INLINE_ uint32_t halfbits_to_floatbits(uint16_t h) {