mirror of
https://github.com/BinomialLLC/basis_universal.git
synced 2026-10-14 13:05:30 +00:00
Merging as much of PR #408 as we safely can.
PR 408's cmakelists.txt file has too many issues (OpenCL breaks on Windows/OSX) and changing our options to have the "BASISU_" prefix will break upstream builds.
This commit is contained in:
4
encoder/3rdparty/android_astc_decomp.cpp
vendored
4
encoder/3rdparty/android_astc_decomp.cpp
vendored
@@ -1880,7 +1880,7 @@ half_float float_to_half(float val, bool toward_zero)
|
||||
if (toward_zero)
|
||||
m = (int)truncf((1 << 24) * fabsf(fi.f));
|
||||
else
|
||||
m = lrintf((1 << 24) * fabsf(fi.f));
|
||||
m = (int)lrintf((1 << 24) * fabsf(fi.f));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1888,7 +1888,7 @@ half_float float_to_half(float val, bool toward_zero)
|
||||
if (toward_zero)
|
||||
m = (int)truncf((float)flt_m * (1.0f / (float)(1 << 13)));
|
||||
else
|
||||
m = lrintf((float)flt_m * (1.0f / (float)(1 << 13)));
|
||||
m = (int)lrintf((float)flt_m * (1.0f / (float)(1 << 13)));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user