Commit 3f1a7abf authored by David Adam's avatar David Adam Committed by Alexandre Julliard

d3dx9_36: Fix failing tests in Windows.

parent befb0a06
...@@ -164,13 +164,13 @@ D3DXMATRIX* WINAPI D3DXMatrixTransformation2D( ...@@ -164,13 +164,13 @@ D3DXMATRIX* WINAPI D3DXMatrixTransformation2D(
{ {
sca.x=pscaling->x; sca.x=pscaling->x;
sca.y=pscaling->y; sca.y=pscaling->y;
sca.z=0.0f; sca.z=1.0f;
} }
else else
{ {
sca.x=0.0f; sca.x=1.0f;
sca.y=0.0f; sca.y=1.0f;
sca.z=0.0f; sca.z=1.0f;
} }
if ( protationcenter ) if ( protationcenter )
......
...@@ -612,7 +612,7 @@ static void test_Matrix_Transformation2D(void) ...@@ -612,7 +612,7 @@ static void test_Matrix_Transformation2D(void)
U(exp_mat).m[3][1] = -13.401899f; U(exp_mat).m[3][1] = -13.401899f;
U(exp_mat).m[0][2] = 0.0f; U(exp_mat).m[0][2] = 0.0f;
U(exp_mat).m[1][2] = 0.0f; U(exp_mat).m[1][2] = 0.0f;
U(exp_mat).m[2][2] = 0.0f; U(exp_mat).m[2][2] = 1.0f;
U(exp_mat).m[3][2] = 0.0f; U(exp_mat).m[3][2] = 0.0f;
U(exp_mat).m[0][3] = 0.0f; U(exp_mat).m[0][3] = 0.0f;
U(exp_mat).m[1][3] = 0.0f; U(exp_mat).m[1][3] = 0.0f;
...@@ -635,17 +635,17 @@ static void test_Matrix_Transformation2D(void) ...@@ -635,17 +635,17 @@ static void test_Matrix_Transformation2D(void)
sca_rot = 5.0f*D3DX_PI/4.0f; sca_rot = 5.0f*D3DX_PI/4.0f;
U(exp_mat).m[0][0] = 0.0f; U(exp_mat).m[0][0] = 0.50f;
U(exp_mat).m[1][0] = 0.0f; U(exp_mat).m[1][0] = -0.866025f;
U(exp_mat).m[2][0] = 0.0f; U(exp_mat).m[2][0] = 0.0f;
U(exp_mat).m[3][0] = 2.830127f; U(exp_mat).m[3][0] = -6.0f;
U(exp_mat).m[0][1] = 0.0f; U(exp_mat).m[0][1] = 0.866025f;
U(exp_mat).m[1][1] = 0.0f; U(exp_mat).m[1][1] = 0.50f;
U(exp_mat).m[2][1] = 0.0f; U(exp_mat).m[2][1] = 0.0f;
U(exp_mat).m[3][1] = 12.294229f; U(exp_mat).m[3][1] = 7.0f;
U(exp_mat).m[0][2] = 0.0f; U(exp_mat).m[0][2] = 0.0f;
U(exp_mat).m[1][2] = 0.0f; U(exp_mat).m[1][2] = 0.0f;
U(exp_mat).m[2][2] = 0.0f; U(exp_mat).m[2][2] = 1.0f;
U(exp_mat).m[3][2] = 0.0f; U(exp_mat).m[3][2] = 0.0f;
U(exp_mat).m[0][3] = 0.0f; U(exp_mat).m[0][3] = 0.0f;
U(exp_mat).m[1][3] = 0.0f; U(exp_mat).m[1][3] = 0.0f;
...@@ -655,6 +655,29 @@ static void test_Matrix_Transformation2D(void) ...@@ -655,6 +655,29 @@ static void test_Matrix_Transformation2D(void)
D3DXMatrixTransformation2D(&got_mat, &sca_center, sca_rot, NULL, NULL, rot, &trans); D3DXMatrixTransformation2D(&got_mat, &sca_center, sca_rot, NULL, NULL, rot, &trans);
expect_mat(&exp_mat, &got_mat); expect_mat(&exp_mat, &got_mat);
/*_________*/
U(exp_mat).m[0][0] = 0.50f;
U(exp_mat).m[1][0] = -0.866025f;
U(exp_mat).m[2][0] = 0.0f;
U(exp_mat).m[3][0] = 0.0f;
U(exp_mat).m[0][1] = 0.866025f;
U(exp_mat).m[1][1] = 0.50f;
U(exp_mat).m[2][1] = 0.0f;
U(exp_mat).m[3][1] = 0.0f;
U(exp_mat).m[0][2] = 0.0f;
U(exp_mat).m[1][2] = 0.0f;
U(exp_mat).m[2][2] = 1.0f;
U(exp_mat).m[3][2] = 0.0f;
U(exp_mat).m[0][3] = 0.0f;
U(exp_mat).m[1][3] = 0.0f;
U(exp_mat).m[2][3] = 0.0f;
U(exp_mat).m[3][3] = 1.0f;
D3DXMatrixTransformation2D(&got_mat, NULL, sca_rot, NULL, NULL, rot, NULL);
expect_mat(&exp_mat, &got_mat);
} }
static void test_D3DXVec_Array(void) static void test_D3DXVec_Array(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment