aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/Matrix44Test.cpp
diff options
context:
space:
mode:
authorGravatar aelias@chromium.org <aelias@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-10-04 22:26:28 +0000
committerGravatar aelias@chromium.org <aelias@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-10-04 22:26:28 +0000
commit851af07b11ad1d5482958dcef5689bd8841b4a94 (patch)
tree982cd0dc44b7ac63c8f99ffa21edc7a448a3278e /tests/Matrix44Test.cpp
parent761f860a427e9ebb088c4d1e5fba04deb29b5a6f (diff)
Revert "Add perspective support to SkMatrix44 initializers."
This reverts commit 93db1bcae0863feed8d00a61ae2cf72a90a0083c. git-svn-id: http://skia.googlecode.com/svn/trunk@11623 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/Matrix44Test.cpp')
-rw-r--r--tests/Matrix44Test.cpp45
1 files changed, 0 insertions, 45 deletions
diff --git a/tests/Matrix44Test.cpp b/tests/Matrix44Test.cpp
index 001d8a695f..67af60df90 100644
--- a/tests/Matrix44Test.cpp
+++ b/tests/Matrix44Test.cpp
@@ -471,50 +471,6 @@ static void test_set_row_col_major(skiatest::Reporter* reporter) {
REPORTER_ASSERT(reporter, nearly_equal(a, b));
}
-static void test_3x3_conversion(skiatest::Reporter* reporter) {
- SkMScalar values4x4[16] = { 1, 2, 3, 4,
- 5, 6, 7, 8,
- 9, 10, 11, 12,
- 13, 14, 15, 16 };
- SkMScalar values3x3[9] = { 1, 2, 4,
- 5, 6, 8,
- 13, 14, 16 };
- SkMScalar values4x4flattened[16] = { 1, 2, 0, 4,
- 5, 6, 0, 8,
- 0, 0, 1, 0,
- 13, 14, 0, 16 };
- SkMatrix44 a44;
- a44.setRowMajor(values4x4);
-
- SkMatrix a33 = a44;
- SkMatrix expected33;
- for (int i = 0; i < 9; i++) expected33[i] = values3x3[i];
- REPORTER_ASSERT(reporter, expected33 == a33);
-
- SkMatrix44 a44flattened = a33;
- SkMatrix44 expected44flattened;
- expected44flattened.setRowMajor(values4x4flattened);
- REPORTER_ASSERT(reporter, nearly_equal(a44flattened, expected44flattened));
-
- // Test that a point with a Z value of 0 is transformed the same way.
- SkScalar vec4[4] = { 2, 4, 0, 8 };
- SkScalar vec3[3] = { 2, 4, 8 };
-
- SkScalar vec4transformed[4];
- SkScalar vec3transformed[3];
- SkScalar vec4transformed2[4];
- a44.mapScalars(vec4, vec4transformed);
- a33.mapHomogeneousPoints(vec3transformed, vec3, 1);
- a44flattened.mapScalars(vec4, vec4transformed2);
- REPORTER_ASSERT(reporter, vec4transformed[0] == vec3transformed[0]);
- REPORTER_ASSERT(reporter, vec4transformed[1] == vec3transformed[1]);
- REPORTER_ASSERT(reporter, vec4transformed[3] == vec3transformed[2]);
- REPORTER_ASSERT(reporter, vec4transformed[0] == vec4transformed2[0]);
- REPORTER_ASSERT(reporter, vec4transformed[1] == vec4transformed2[1]);
- REPORTER_ASSERT(reporter, vec4transformed[2] != vec4transformed2[2]);
- REPORTER_ASSERT(reporter, vec4transformed[3] == vec4transformed2[3]);
-}
-
static void TestMatrix44(skiatest::Reporter* reporter) {
SkMatrix44 mat, inverse, iden1, iden2, rot;
@@ -616,7 +572,6 @@ static void TestMatrix44(skiatest::Reporter* reporter) {
test_translate(reporter);
test_scale(reporter);
test_map2(reporter);
- test_3x3_conversion(reporter);
}
#include "TestClassDef.h"