diff options
author | mtklein <mtklein@chromium.org> | 2015-06-09 11:47:01 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-09 11:47:01 -0700 |
commit | 1831f990c31bad0d84641663c96aa8eebf846ab9 (patch) | |
tree | b6924d3cef071f5c56a37c43cd1de1e45ba7466e /bench/Matrix44Bench.cpp | |
parent | 1aca86490410434020eefd2a27ee61a002871391 (diff) |
A bunch of little SkMScalar-as-float build fixes.
Landing this before http://crrev.com/1169813006 so the test changes needed
there are clearer. This just lets things build with floats, and is a no-op for
doubles.
No public API changes we didn't intend to already have...
TBR=reed@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1173673003
Diffstat (limited to 'bench/Matrix44Bench.cpp')
-rw-r--r-- | bench/Matrix44Bench.cpp | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/bench/Matrix44Bench.cpp b/bench/Matrix44Bench.cpp index a990763b62..98025f1544 100644 --- a/bench/Matrix44Bench.cpp +++ b/bench/Matrix44Bench.cpp @@ -116,22 +116,22 @@ public: , fM0(SkMatrix44::kUninitialized_Constructor) , fM1(SkMatrix44::kUninitialized_Constructor) { - fM0.set(0, 0, -1.1); - fM0.set(0, 1, 2.1); - fM0.set(0, 2, -3.1); - fM0.set(0, 3, 4.1); - fM0.set(1, 0, 5.1); - fM0.set(1, 1, -6.1); - fM0.set(1, 2, 7.1); - fM0.set(1, 3, 8.1); - fM0.set(2, 0, -9.1); - fM0.set(2, 1, 10.1); - fM0.set(2, 2, 11.1); - fM0.set(2, 3, -12.1); - fM0.set(3, 0, -13.1); - fM0.set(3, 1, 14.1); - fM0.set(3, 2, -15.1); - fM0.set(3, 3, 16.1); + fM0.setDouble(0, 0, -1.1); + fM0.setDouble(0, 1, 2.1); + fM0.setDouble(0, 2, -3.1); + fM0.setDouble(0, 3, 4.1); + fM0.setDouble(1, 0, 5.1); + fM0.setDouble(1, 1, -6.1); + fM0.setDouble(1, 2, 7.1); + fM0.setDouble(1, 3, 8.1); + fM0.setDouble(2, 0, -9.1); + fM0.setDouble(2, 1, 10.1); + fM0.setDouble(2, 2, 11.1); + fM0.setDouble(2, 3, -12.1); + fM0.setDouble(3, 0, -13.1); + fM0.setDouble(3, 1, 14.1); + fM0.setDouble(3, 2, -15.1); + fM0.setDouble(3, 3, 16.1); } protected: virtual void performTest() { @@ -151,18 +151,18 @@ public: , fM0(SkMatrix44::kIdentity_Constructor) , fM1(SkMatrix44::kUninitialized_Constructor) { - fM0.set(0, 0, -1.1); - fM0.set(0, 1, 2.1); - fM0.set(0, 2, -3.1); - fM0.set(0, 3, 4.1); - fM0.set(1, 0, 5.1); - fM0.set(1, 1, -6.1); - fM0.set(1, 2, 7.1); - fM0.set(1, 3, 8.1); - fM0.set(2, 0, -9.1); - fM0.set(2, 1, 10.1); - fM0.set(2, 2, 11.1); - fM0.set(2, 3, -12.1); + fM0.setDouble(0, 0, -1.1); + fM0.setDouble(0, 1, 2.1); + fM0.setDouble(0, 2, -3.1); + fM0.setDouble(0, 3, 4.1); + fM0.setDouble(1, 0, 5.1); + fM0.setDouble(1, 1, -6.1); + fM0.setDouble(1, 2, 7.1); + fM0.setDouble(1, 3, 8.1); + fM0.setDouble(2, 0, -9.1); + fM0.setDouble(2, 1, 10.1); + fM0.setDouble(2, 2, 11.1); + fM0.setDouble(2, 3, -12.1); // bottom row (perspective component) remains (0, 0, 0, 1). } protected: @@ -183,14 +183,14 @@ public: , fM0(SkMatrix44::kIdentity_Constructor) , fM1(SkMatrix44::kUninitialized_Constructor) { - fM0.set(0, 0, -1.1); - fM0.set(0, 3, 4.1); + fM0.setDouble(0, 0, -1.1); + fM0.setDouble(0, 3, 4.1); - fM0.set(1, 1, -6.1); - fM0.set(1, 3, 8.1); + fM0.setDouble(1, 1, -6.1); + fM0.setDouble(1, 3, 8.1); - fM0.set(2, 2, 11.1); - fM0.set(2, 3, -12.1); + fM0.setDouble(2, 2, 11.1); + fM0.setDouble(2, 3, -12.1); } protected: virtual void performTest() { @@ -210,9 +210,9 @@ public: , fM0(SkMatrix44::kIdentity_Constructor) , fM1(SkMatrix44::kUninitialized_Constructor) { - fM0.set(0, 3, 4.1); - fM0.set(1, 3, 8.1); - fM0.set(2, 3, -12.1); + fM0.setDouble(0, 3, 4.1); + fM0.setDouble(1, 3, 8.1); + fM0.setDouble(2, 3, -12.1); } protected: virtual void performTest() { |