aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkNx.h
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-07-14 05:23:50 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-07-14 05:23:50 -0700
commitbfd9ee67eff5262dc1a395cf4f757419f5928718 (patch)
tree6b10d061dfce0f12711278e7aa7bc7b944c74804 /src/core/SkNx.h
parent6968428f44e8cc42edee7e3238b37e3b3a46106f (diff)
Fix typo in non-SIMD Sk4f::thenElse().
This was causing the 3 xfermodes that use floats and conditionals to draw wrong when SKNX_NO_SIMD was defined. BUG=skia:4051 Review URL: https://codereview.chromium.org/1229013003
Diffstat (limited to 'src/core/SkNx.h')
-rw-r--r--src/core/SkNx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkNx.h b/src/core/SkNx.h
index dadb3ec132..84f9b69353 100644
--- a/src/core/SkNx.h
+++ b/src/core/SkNx.h
@@ -141,7 +141,7 @@ public:
bool allTrue() const { return fLo.allTrue() && fHi.allTrue(); }
bool anyTrue() const { return fLo.anyTrue() || fHi.anyTrue(); }
SkNf thenElse(const SkNf& t, const SkNf& e) const {
- return SkNf(fLo.thenElse(t.fLo, t.fHi), fHi.thenElse(t.fLo, t.fHi));
+ return SkNf(fLo.thenElse(t.fLo, e.fLo), fHi.thenElse(t.fHi, e.fHi));
}
protected: