diff options
| author |  mtklein <mtklein@chromium.org> | 2015-06-09 15:06:22 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-09 15:06:22 -0700 |
| commit | 519580553ab85ef04c6a08d8e09ef0eb93c7bc1f (patch) | |
| tree | 68d0efd3bb825203c3694a448437103dc233bb0e /tests | |
| parent | b23e6aa6767816ac4bc6c191e78ef62d6e765671 (diff) | |
Use SkMScalar as float by default to match Chromium.
Tweak some test values to pass with floats.
As expected, this regresses matrix44_setconcat_general by about 2x.
BUG=skia:
Review URL: https://codereview.chromium.org/1169813006
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Matrix44Test.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/Matrix44Test.cpp b/tests/Matrix44Test.cpp index 939675499c..cd11a7da2d 100644 --- a/tests/Matrix44Test.cpp +++ b/tests/Matrix44Test.cpp @@ -368,15 +368,15 @@ static void test_invert(skiatest::Reporter* reporter) { 0, 0, 0, 1); SkMatrix44 scaleTranslation(SkMatrix44::kUninitialized_Constructor); - scaleTranslation.setScale(10, 100, 1000); + scaleTranslation.setScale(32, 128, 1024); scaleTranslation.preTranslate(2, 3, 4); scaleTranslation.invert(&inverse); inverse.asRowMajord(inverseData); assert16<double>(reporter, inverseData, - 0.1, 0, 0, -2, - 0, 0.01, 0, -3, - 0, 0, 0.001, -4, - 0, 0, 0, 1); + 0.03125, 0, 0, -2, + 0, 0.0078125, 0, -3, + 0, 0, 0.0009765625, -4, + 0, 0, 0, 1); SkMatrix44 rotation(SkMatrix44::kUninitialized_Constructor); rotation.setRotateDegreesAbout(0, 0, 1, 90); @@ -831,14 +831,14 @@ DEF_TEST(Matrix44, reporter) { // test mixed-valued matrix inverse mat.reset(); - mat.setScale(SkDoubleToMScalar(1.0e-10), + mat.setScale(SkDoubleToMScalar(1.0e-2), SkDoubleToMScalar(3.0), - SkDoubleToMScalar(1.0e+10)); + SkDoubleToMScalar(1.0e+2)); rot.setRotateDegreesAbout(0, 0, -1, 90); mat.postConcat(rot); - mat.postTranslate(SkDoubleToMScalar(1.0e+10), + mat.postTranslate(SkDoubleToMScalar(1.0e+2), SkDoubleToMScalar(3.0), - SkDoubleToMScalar(1.0e-10)); + SkDoubleToMScalar(1.0e-2)); REPORTER_ASSERT(reporter, mat.invert(NULL)); mat.invert(&inverse); iden1.setConcat(mat, inverse); |