diff options
| author |  skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> | 2018-06-05 16:34:43 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-05 17:16:59 +0000 |
| commit | bd04be76ad9739dd1b67aca6a8a3ef4cf6d1c228 (patch) | |
| tree | a6cec9a26606326e8ff01f8339a3f18ca0d78d78 /third_party | |
| parent | 2f2a703f33c46800962db32e19faf9c13d26f3d5 (diff) | |
Roll skia/third_party/skcms a8a5c9e..2e43fec (1 commits)
https://skia.googlesource.com/skcms.git/+log/a8a5c9e..2e43fec
2018-06-05 mtklein@chromium.org clean up option for old powf()
The AutoRoll server is located here: https://skcms-skia-roll.skia.org
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
TBR=halcanary@google.com
Change-Id: Ic1556a1a02d339f76f53d446bd2311c6ebd775a6
Reviewed-on: https://skia-review.googlesource.com/132200
Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/skcms/src/PortableMath.c | 10 | ||||
| -rw-r--r-- | third_party/skcms/src/Transform_inl.h | 10 | ||||
| -rwxr-xr-x | third_party/skcms/version.sha1 | 2 |
3 files changed, 1 insertions, 21 deletions
diff --git a/third_party/skcms/src/PortableMath.c b/third_party/skcms/src/PortableMath.c index a2e62a53a8..b50cb0f1c2 100644 --- a/third_party/skcms/src/PortableMath.c +++ b/third_party/skcms/src/PortableMath.c @@ -50,16 +50,6 @@ float exp2f_(float x) { } float powf_(float x, float y) { -#if defined(SKCMS_LEGACY_POWF) - float r = 1.0f; - while (y >= 1.0f && y < 32) { - r *= x; - y -= 1.0f; - } - return (x == 0) || (x == 1) ? x - : r * exp2f_(log2f_(x) * y); -#else return (x == 0) || (x == 1) ? x : exp2f_(log2f_(x) * y); -#endif } diff --git a/third_party/skcms/src/Transform_inl.h b/third_party/skcms/src/Transform_inl.h index cb11777e52..224412bfa4 100644 --- a/third_party/skcms/src/Transform_inl.h +++ b/third_party/skcms/src/Transform_inl.h @@ -225,18 +225,8 @@ SI ATTR F NS(approx_exp2_)(F x) { #define approx_exp2 NS(approx_exp2_) SI ATTR F NS(approx_pow_)(F x, float y) { -#if defined(SKCMS_LEGACY_POWF) - F r = F1; - while (y >= 1.0f) { - r *= x; - y -= 1.0f; - } - return (F)if_then_else((x == F0) | (x == F1), x - , r * approx_exp2(approx_log2(x) * y)); -#else return (F)if_then_else((x == F0) | (x == F1), x , approx_exp2(approx_log2(x) * y)); -#endif } #define approx_pow NS(approx_pow_) diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1 index 685b6b7ffa..abe8f01a53 100755 --- a/third_party/skcms/version.sha1 +++ b/third_party/skcms/version.sha1 @@ -1 +1 @@ -a8a5c9ee1b323d5919e54e1c105f207ad635baa8
\ No newline at end of file +2e43fec5976a4b319fb71f7efb6e5d0babdca0f1
\ No newline at end of file |