aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party
diff options
context:
space:
mode:
authorGravatar skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>2018-06-05 17:25:43 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-05 18:17:59 +0000
commit5e6853ddfd08c9b11351665df42eadab54e0bdae (patch)
treefbb8a84c8bad19e4bfaebffb578099fdf2893550 /third_party
parentd00ef066198b40aa0b02603fe4766b31996eb835 (diff)
Roll skia/third_party/skcms 2e43fec..0fdd840 (1 commits)
https://skia.googlesource.com/skcms.git/+log/2e43fec..0fdd840 2018-06-05 mtklein@chromium.org force wasm into N=1 transform code paths 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: Ib8763e877f4d9b8d2cd044b2c521519d9b4ee68c Reviewed-on: https://skia-review.googlesource.com/132203 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/Transform.c9
-rwxr-xr-xthird_party/skcms/version.sha12
2 files changed, 10 insertions, 1 deletions
diff --git a/third_party/skcms/src/Transform.c b/third_party/skcms/src/Transform.c
index df31c7a1af..0de0727241 100644
--- a/third_party/skcms/src/Transform.c
+++ b/third_party/skcms/src/Transform.c
@@ -17,6 +17,15 @@
#include <stdint.h>
#include <string.h>
+// Without this wasm would try to use the N=4 128-bit vector code path,
+// which while ideal, causes tons of compiler problems. This would be
+// a good thing to revisit as emcc matures (currently 1.38.5).
+#if 1 && defined(__EMSCRIPTEN_major__)
+ #if !defined(SKCMS_PORTABLE)
+ #define SKCMS_PORTABLE
+ #endif
+#endif
+
extern bool g_skcms_dump_profile;
bool g_skcms_dump_profile = false;
diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1
index abe8f01a53..51b8549911 100755
--- a/third_party/skcms/version.sha1
+++ b/third_party/skcms/version.sha1
@@ -1 +1 @@
-2e43fec5976a4b319fb71f7efb6e5d0babdca0f1 \ No newline at end of file
+0fdd840919c62b52d431668bdd1aa9d8b6889514 \ No newline at end of file