wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXSHAdd().
by Alexandre Julliard 03 May '17

03 May '17

Module: wine Branch: master Commit: 1f37f24ef66342a927038364431e75880a3e89c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f37f24ef66342a9270383644… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:15 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXSHAdd(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index c861d30..291fcdc 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2543,9 +2543,12 @@ static void test_D3DXFloat_Array(void) static void test_D3DXSHAdd(void) { - UINT i, k; - FLOAT *ret = (FLOAT *)0xdeadbeef; - const FLOAT in1[50] = + float out[50] = {0.0f}; + unsigned int i, k; + float *ret; + BOOL equal; + + static const float in1[50] = { 1.11f, 1.12f, 1.13f, 1.14f, 1.15f, 1.16f, 1.17f, 1.18f, 1.19f, 1.20f, 1.21f, 1.22f, 1.23f, 1.24f, 1.25f, 1.26f, @@ -2555,7 +2558,7 @@ static void test_D3DXSHAdd(void) 1.51f, 1.52f, 1.53f, 1.54f, 1.55f, 1.56f, 1.57f, 1.58f, 1.59f, 1.60f, }; - const FLOAT in2[50] = + static const float in2[50] = { 2.11f, 2.12f, 2.13f, 2.14f, 2.15f, 2.16f, 2.17f, 2.18f, 2.19f, 2.20f, 2.21f, 2.22f, 2.23f, 2.24f, 2.25f, 2.26f, @@ -2565,7 +2568,6 @@ static void test_D3DXSHAdd(void) 2.51f, 2.52f, 2.53f, 2.54f, 2.55f, 2.56f, 2.57f, 2.58f, 2.59f, 2.60f, }; - FLOAT out[50] = {0.0f}; /* * Order is not limited by D3DXSH_MINORDER and D3DXSH_MAXORDER! @@ -2581,10 +2583,11 @@ static void test_D3DXSHAdd(void) for (i = 0; i < count; ++i) { - ok(relative_error(in1[i] + in2[i], out[i]) < admitted_error, - "%u-%u: D3DXSHAdd() failed, got %f, expected %f\n", k, i, out[i], in1[i] + in2[i]); + equal = compare_float(in1[i] + in2[i], out[i], 0); + ok(equal, "%u-%u: Got %.8e, expected %.8e.\n", k, i, out[i], in1[i] + in2[i]); } - ok(relative_error(out[count], 0.0f) < admitted_error, "%u-%u: D3DXSHAdd() failed, got %f, expected 0.0\n", k, k * k, out[count]); + equal = compare_float(out[count], 0.0f, 0); + ok(equal, "%u-%u: Got %.8e, expected 0.0.\n", k, k * k, out[count]); } }

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in test_D3DXFloat_Array() .
by Alexandre Julliard 03 May '17

03 May '17

Module: wine Branch: master Commit: 0c0f5798ba4de4085b8045aa2f1f595707fa1786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0f5798ba4de4085b8045aa2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:14 2017 +0200 d3dx9/tests: Use compare_float() in test_D3DXFloat_Array(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 35b72d7..c861d30 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2459,14 +2459,14 @@ static void test_D3DXFloat_Array(void) unsigned int i; void *out = NULL; D3DXFLOAT16 half; - FLOAT single; + BOOL equal; /* Input floats through bit patterns because compilers do not generate reliable INF and NaN values. */ union convert { DWORD d; - FLOAT f; - }; + float f; + } single; struct { @@ -2487,7 +2487,7 @@ static void test_D3DXFloat_Array(void) { { 0x477ff100 }, 0x7c00, 0x7c00, { 0x47800000 }, { 0x47800000 } }, /* 65521.0f */ { { 0x477ffe00 }, 0x7c00, 0x7c00, { 0x47800000 }, { 0x47800000 } }, /* 65534.0f */ - { { 0x477fff00 }, 0x7c00, 0x7c00, { 0x477fff00 }, { 0x47800000 } }, /* 65535.0f */ + { { 0x477fff00 }, 0x7c00, 0x7c00, { 0x47800000 }, { 0x47800000 } }, /* 65535.0f */ { { 0x47800000 }, 0x7c00, 0x7c00, { 0x47800000 }, { 0x47800000 } }, /* 65536.0f */ { { 0xc79c4000 }, 0xfc00, 0xfce2, { 0xc7800000 }, { 0xc79c4000 } }, /* -80000.0f */ { { 0xc77fdf00 }, 0xfbff, 0xfbff, { 0xc77fe000 }, { 0xc77fe000 } }, /* -65503.0f */ @@ -2496,7 +2496,7 @@ static void test_D3DXFloat_Array(void) { { 0xc77ff000 }, 0xfbff, 0xfc00, { 0xc77fe000 }, { 0xc7800000 } }, /* -65520.0f */ { { 0xc77ff100 }, 0xfc00, 0xfc00, { 0xc7800000 }, { 0xc7800000 } }, /* -65521.0f */ { { 0xc77ffe00 }, 0xfc00, 0xfc00, { 0xc7800000 }, { 0xc7800000 } }, /* -65534.0f */ - { { 0xc77fff00 }, 0xfc00, 0xfc00, { 0xc77fff00 }, { 0xc7800000 } }, /* -65535.0f */ + { { 0xc77fff00 }, 0xfc00, 0xfc00, { 0xc7800000 }, { 0xc7800000 } }, /* -65535.0f */ { { 0xc7800000 }, 0xfc00, 0xfc00, { 0xc7800000 }, { 0xc7800000 } }, /* -65536.0f */ { { 0x7f800000 }, 0x7c00, 0x7fff, { 0x47800000 }, { 0x47ffe000 } }, /* INF */ @@ -2505,21 +2505,21 @@ static void test_D3DXFloat_Array(void) { { 0xffc00000 }, 0xffff, 0xffff, { 0xc7ffe000 }, { 0xc7ffe000 } }, /* -NaN */ { { 0x00000000 }, 0x0000, 0x0000, { 0x00000000 }, { 0x00000000 } }, /* 0.0f */ - { { 0x80000000 }, 0x8000, 0x8000, { 0x00000000 }, { 0x00000000 } }, /* -0.0f */ + { { 0x80000000 }, 0x8000, 0x8000, { 0x80000000 }, { 0x80000000 } }, /* -0.0f */ { { 0x330007ff }, 0x0000, 0x0000, { 0x00000000 }, { 0x00000000 } }, /* 2.9809595e-08f */ { { 0xb30007ff }, 0x8000, 0x8000, { 0x80000000 }, { 0x80000000 } }, /* -2.9809595e-08f */ - { { 0x33000800 }, 0x0001, 0x0000, { 0x337ffff3 }, { 0x337ffff3 } }, /* 2.9809598e-08f */ + { { 0x33000800 }, 0x0001, 0x0000, { 0x33800000 }, { 0x00000000 } }, /* 2.9809598e-08f */ - { { 0xb3000800 }, 0x8001, 0x8000, { 0xb37ffff3 } ,{ 0xb37ffff3 } }, /* -2.9809598e-08f */ - { { 0x33c00000 }, 0x0002, 0x0001, { 0x33ffffd7 }, { 0x337ffff3 } }, /* 8.9406967e-08f */ + { { 0xb3000800 }, 0x8001, 0x8000, { 0xb3800000 }, { 0x80000000 } }, /* -2.9809598e-08f */ + { { 0x33c00000 }, 0x0002, 0x0001, { 0x34000000 }, { 0x33800000 } }, /* 8.9406967e-08f */ }; /* exception on NULL out or in parameter */ - out = D3DXFloat32To16Array(&half, &single, 0); + out = D3DXFloat32To16Array(&half, &single.f, 0); ok(out == &half, "Got %p, expected %p.\n", out, &half); - out = D3DXFloat16To32Array(&single, &half, 0); - ok(out == &single, "Got %p, expected %p.\n", out, &single); + out = D3DXFloat16To32Array(&single.f, &half, 0); + ok(out == &single.f, "Got %p, expected %p.\n", out, &single.f); for (i = 0; i < sizeof(testdata)/sizeof(testdata[0]); i++) { @@ -2529,15 +2529,15 @@ static void test_D3DXFloat_Array(void) "Got %x, expected %x or %x for index %d.\n", half.value, testdata[i].half_ver1, testdata[i].half_ver2, i); - out = D3DXFloat16To32Array(&single, (D3DXFLOAT16 *)&testdata[i].half_ver1, 1); - ok(out == &single, "Got %p, expected %p.\n", out, &single); - ok(relative_error(single, testdata[i].single_out_ver1.f) < admitted_error, - "Got %g, expected %g for index %d.\n", single, testdata[i].single_out_ver1.f, i); + out = D3DXFloat16To32Array(&single.f, (D3DXFLOAT16 *)&testdata[i].half_ver1, 1); + ok(out == &single.f, "Got %p, expected %p.\n", out, &single.f); + equal = compare_float(single.f, testdata[i].single_out_ver1.f, 0); + ok(equal, "Got %#x, expected %#x at index %u.\n", single.d, testdata[i].single_out_ver1.d, i); - out = D3DXFloat16To32Array(&single, (D3DXFLOAT16 *)&testdata[i].half_ver2, 1); - ok(out == &single, "Got %p, expected %p.\n", out, &single); - ok(relative_error(single, testdata[i].single_out_ver2.f) < admitted_error, - "Got %g, expected %g for index %d.\n", single, testdata[i].single_out_ver2.f, i); + out = D3DXFloat16To32Array(&single.f, (D3DXFLOAT16 *)&testdata[i].half_ver2, 1); + ok(out == &single.f, "Got %p, expected %p.\n", out, &single.f); + equal = compare_float(single.f, testdata[i].single_out_ver2.f, 0); + ok(equal, "Got %#x, expected %#x at index %u.\n", single.d, testdata[i].single_out_ver2.d, i); } }

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in D3DXVector4Test().
by Alexandre Julliard 03 May '17

03 May '17

Module: wine Branch: master Commit: d8c45575e1900ee812cb19cc9a0ee658f7a8fced URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c45575e1900ee812cb19cc9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:13 2017 +0200 d3dx9/tests: Use compare_float() in D3DXVector4Test(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 462ae3f..35b72d7 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1537,8 +1537,9 @@ static void D3DXVector4Test(void) D3DXVECTOR4 expectedvec, gotvec, u, v, w, x; LPD3DXVECTOR4 funcpointer; D3DXVECTOR4 expectedtrans, gottrans; + float coeff1, coeff2, got, scale; D3DXMATRIX mat; - FLOAT coeff1, coeff2, expected, got, scale; + BOOL equal; u.x = 1.0f; u.y = 2.0f; u.z = 4.0f; u.w = 10.0; v.x = -3.0f; v.y = 4.0f; v.z = -5.0f; v.w = 7.0; @@ -1579,16 +1580,16 @@ static void D3DXVector4Test(void) expect_vec4(&expectedvec, &gotvec, 0); /*_______________D3DXVec4Dot__________________________*/ - expected = 55.0f; - got = D3DXVec4Dot(&u,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; - got = D3DXVec4Dot(NULL,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - expected=0.0f; - got = D3DXVec4Dot(NULL,NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + got = D3DXVec4Dot(&u, &v); + equal = compare_float(got, 55.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); + /* Tests the case NULL. */ + got = D3DXVec4Dot(NULL, &v); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); + got = D3DXVec4Dot(NULL, NULL); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /*_______________D3DXVec4Hermite_________________________*/ expectedvec.x = 1224.625f; expectedvec.y = 3461.625f; expectedvec.z = -4758.875f; expectedvec.w = -5781.5f; @@ -1596,22 +1597,22 @@ static void D3DXVector4Test(void) expect_vec4(&expectedvec, &gotvec, 0); /*_______________D3DXVec4Length__________________________*/ - expected = 11.0f; - got = D3DXVec4Length(&u); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; + got = D3DXVec4Length(&u); + equal = compare_float(got, 11.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); + /* Tests the case NULL. */ got = D3DXVec4Length(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXVec4LengthSq________________________*/ - expected = 121.0f; got = D3DXVec4LengthSq(&u); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; + equal = compare_float(got, 121.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); + /* Tests the case NULL. */ got = D3DXVec4LengthSq(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXVec4Lerp__________________________*/ expectedvec.x = 27.0f; expectedvec.y = -11.0f; expectedvec.z = 62.5; expectedvec.w = 29.5;

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in D3DXVector3Test().
by Alexandre Julliard 03 May '17

03 May '17

Module: wine Branch: master Commit: c8b95bbd62ad291ea158a8b3387cd48a67cff039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b95bbd62ad291ea158a8b33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:12 2017 +0200 d3dx9/tests: Use compare_float() in D3DXVector3Test(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 08751a7..462ae3f 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1301,7 +1301,8 @@ static void D3DXVector3Test(void) LPD3DXVECTOR3 funcpointer; D3DXVECTOR4 expectedtrans, gottrans; D3DXMATRIX mat, projection, view, world; - FLOAT coeff1, coeff2, expected, got, scale; + float coeff1, coeff2, got, scale; + BOOL equal; nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; u.x = 9.0f; u.y = 6.0f; u.z = 2.0f; @@ -1366,16 +1367,16 @@ static void D3DXVector3Test(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXVec3Dot__________________________*/ - expected = -8.0f; - got = D3DXVec3Dot(&u,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + got = D3DXVec3Dot(&u, &v); + equal = compare_float(got, -8.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /* Tests the case NULL */ - expected=0.0f; - got = D3DXVec3Dot(NULL,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - expected=0.0f; - got = D3DXVec3Dot(NULL,NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + got = D3DXVec3Dot(NULL, &v); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); + got = D3DXVec3Dot(NULL, NULL); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /*_______________D3DXVec3Hermite__________________________*/ expectedvec.x = -6045.75f; expectedvec.y = -6650.0f; expectedvec.z = 1358.875f; @@ -1383,22 +1384,22 @@ static void D3DXVector3Test(void) expect_vec3(&expectedvec, &gotvec, 0); /*_______________D3DXVec3Length__________________________*/ - expected = 11.0f; got = D3DXVec3Length(&u); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; + equal = compare_float(got, 11.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); + /* Tests the case NULL. */ got = D3DXVec3Length(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXVec3LengthSq________________________*/ - expected = 121.0f; got = D3DXVec3LengthSq(&u); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; + equal = compare_float(got, 121.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); + /* Tests the case NULL. */ got = D3DXVec3LengthSq(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXVec3Lerp__________________________*/ expectedvec.x = 54.5f; expectedvec.y = 64.5f, expectedvec.z = 41.0f ;

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in D3DXVector2Test().
by Alexandre Julliard 03 May '17

03 May '17

Module: wine Branch: master Commit: a7d12ef7cf9f6a0f4f7ca9b9547aa8db246181b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d12ef7cf9f6a0f4f7ca9b95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:11 2017 +0200 d3dx9/tests: Use compare_float() in D3DXVector2Test(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 65 +++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 5b25e91..08751a7 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1128,8 +1128,9 @@ static void D3DXVector2Test(void) D3DXVECTOR2 expectedvec, gotvec, nul, u, v, w, x; LPD3DXVECTOR2 funcpointer; D3DXVECTOR4 expectedtrans, gottrans; + float coeff1, coeff2, got, scale; D3DXMATRIX mat; - FLOAT coeff1, coeff2, expected, got, scale; + BOOL equal; nul.x = 0.0f; nul.y = 0.0f; u.x = 3.0f; u.y = 4.0f; @@ -1166,28 +1167,28 @@ static void D3DXVector2Test(void) expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2CCW__________________________*/ - expected = 55.0f; - got = D3DXVec2CCW(&u,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; - got = D3DXVec2CCW(NULL,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - expected=0.0f; - got = D3DXVec2CCW(NULL,NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + got = D3DXVec2CCW(&u, &v); + equal = compare_float(got, 55.0f, 0); + ok(equal, "Got unexpected ccw %.8e.\n", got); + /* Tests the case NULL. */ + got = D3DXVec2CCW(NULL, &v); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected ccw %.8e.\n", got); + got = D3DXVec2CCW(NULL, NULL); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected ccw %.8e.\n", got); /*_______________D3DXVec2Dot__________________________*/ - expected = 15.0f; - got = D3DXVec2Dot(&u,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + got = D3DXVec2Dot(&u, &v); + equal = compare_float(got, 15.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /* Tests the case NULL */ - expected=0.0f; - got = D3DXVec2Dot(NULL,&v); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - expected=0.0f; - got = D3DXVec2Dot(NULL,NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + got = D3DXVec2Dot(NULL, &v); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); + got = D3DXVec2Dot(NULL, NULL); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /*_______________D3DXVec2Hermite__________________________*/ expectedvec.x = 2604.625f; expectedvec.y = -4533.0f; @@ -1195,22 +1196,22 @@ static void D3DXVector2Test(void) expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2Length__________________________*/ - expected = 5.0f; - got = D3DXVec2Length(&u); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; + got = D3DXVec2Length(&u); + equal = compare_float(got, 5.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); + /* Tests the case NULL. */ got = D3DXVec2Length(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXVec2LengthSq________________________*/ - expected = 25.0f; - got = D3DXVec2LengthSq(&u); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; + got = D3DXVec2LengthSq(&u); + equal = compare_float(got, 25.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); + /* Tests the case NULL. */ got = D3DXVec2LengthSq(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXVec2Lerp__________________________*/ expectedvec.x = 68.0f; expectedvec.y = -28.5f;

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in D3DXQuaternionTest().
by Alexandre Julliard 03 May '17

03 May '17

Module: wine Branch: master Commit: b4dca91a537ffb5b322392d2db53c08305a4033d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4dca91a537ffb5b322392d2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:10 2017 +0200 d3dx9/tests: Use compare_float() in D3DXQuaternionTest(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 47 +++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 2098e0f..5b25e91 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -738,10 +738,10 @@ static void D3DXQuaternionTest(void) { D3DXMATRIX mat; D3DXQUATERNION expectedquat, gotquat, Nq, Nq1, nul, smallq, smallr, q, r, s, t, u; + BOOL expectedbool, gotbool, equal; + float angle, got, scale, scale2; LPD3DXQUATERNION funcpointer; D3DXVECTOR3 axis, expectedvec; - FLOAT angle, expected, got, scale, scale2; - BOOL expectedbool, gotbool; nul.x = 0.0f; nul.y = 0.0f; nul.z = 0.0f; nul.w = 0.0f; q.x = 1.0f, q.y = 2.0f; q.z = 4.0f; q.w = 10.0f; @@ -770,16 +770,16 @@ static void D3DXQuaternionTest(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXQuaternionDot______________________*/ - expected = 55.0f; got = D3DXQuaternionDot(&q,&r); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 55.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /* Tests the case NULL */ - expected=0.0f; got = D3DXQuaternionDot(NULL,&r); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - expected=0.0f; + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); got = D3DXQuaternionDot(NULL,NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected dot %.8e.\n", got); /*_______________D3DXQuaternionExp______________________________*/ expectedquat.x = -0.216382f; expectedquat.y = -0.432764f; expectedquat.z = -0.8655270f; expectedquat.w = -0.129449f; @@ -827,22 +827,22 @@ static void D3DXQuaternionTest(void) ok(gotbool == FALSE, "Expected boolean: %d, Got boolean: %d\n", FALSE, gotbool); /*_______________D3DXQuaternionLength__________________________*/ - expected = 11.0f; - got = D3DXQuaternionLength(&q); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); - /* Tests the case NULL */ - expected=0.0f; + got = D3DXQuaternionLength(&q); + equal = compare_float(got, 11.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); + /* Tests the case NULL. */ got = D3DXQuaternionLength(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXQuaternionLengthSq________________________*/ - expected = 121.0f; got = D3DXQuaternionLengthSq(&q); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 121.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /* Tests the case NULL */ - expected=0.0f; got = D3DXQuaternionLengthSq(NULL); - ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + equal = compare_float(got, 0.0f, 0); + ok(equal, "Got unexpected length %.8e.\n", got); /*_______________D3DXQuaternionLn______________________________*/ expectedquat.x = 1.0f; expectedquat.y = 2.0f; expectedquat.z = 4.0f; expectedquat.w = 0.0f; @@ -1101,25 +1101,26 @@ static void D3DXQuaternionTest(void) /*_______________D3DXQuaternionToAxisAngle__________________*/ Nq.x = 1.0f/22.0f; Nq.y = 2.0f/22.0f; Nq.z = 4.0f/22.0f; Nq.w = 10.0f/22.0f; expectedvec.x = 1.0f/22.0f; expectedvec.y = 2.0f/22.0f; expectedvec.z = 4.0f/22.0f; - expected = 2.197869f; D3DXQuaternionToAxisAngle(&Nq,&axis,&angle); expect_vec3(&expectedvec, &axis, 0); - ok(relative_error(angle, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); + equal = compare_float(angle, 2.197869f, 0); + ok(equal, "Got unexpected angle %.8e.\n", angle); /* Test if |w|>1.0f */ expectedvec.x = 1.0f; expectedvec.y = 2.0f; expectedvec.z = 4.0f; D3DXQuaternionToAxisAngle(&q,&axis,&angle); expect_vec3(&expectedvec, &axis, 0); /* Test the null quaternion */ expectedvec.x = 0.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; - expected = 3.141593f; D3DXQuaternionToAxisAngle(&nul, &axis, &angle); expect_vec3(&expectedvec, &axis, 0); - ok(relative_error(angle, expected) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); + equal = compare_float(angle, 3.14159274e+00f, 0); + ok(equal, "Got unexpected angle %.8e.\n", angle); D3DXQuaternionToAxisAngle(&nul, &axis, NULL); D3DXQuaternionToAxisAngle(&nul, NULL, &angle); expect_vec3(&expectedvec, &axis, 0); - ok(relative_error(angle, expected) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); + equal = compare_float(angle, 3.14159274e+00f, 0); + ok(equal, "Got unexpected angle %.8e.\n", angle); } static void D3DXVector2Test(void)

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in D3DXMatrixTest().
by Alexandre Julliard 03 May '17

03 May '17

Module: wine Branch: master Commit: 891c155b8bda70e12dcd0735cb7eaa08e9a93b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=891c155b8bda70e12dcd0735c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:09 2017 +0200 d3dx9/tests: Use compare_float() in D3DXMatrixTest(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 2712009..2098e0f 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -313,13 +313,13 @@ static void D3DXFresnelTest(void) static void D3DXMatrixTest(void) { D3DXMATRIX expectedmat, gotmat, mat, mat2, mat3; + BOOL expected, got, equal; + float angle, determinant; D3DXMATRIX *funcpointer; D3DXPLANE plane; D3DXQUATERNION q, r; D3DXVECTOR3 at, axis, eye, last; D3DXVECTOR4 light; - BOOL expected, got; - FLOAT angle, determinant, expectedfloat, gotfloat; U(mat).m[0][1] = 5.0f; U(mat).m[0][2] = 7.0f; U(mat).m[0][3] = 8.0f; U(mat).m[1][0] = 11.0f; U(mat).m[1][2] = 16.0f; U(mat).m[1][3] = 33.0f; @@ -388,19 +388,19 @@ static void D3DXMatrixTest(void) expect_matrix(&expectedmat, &gotmat, 0); /*____________D3DXMatrixfDeterminant_____________*/ - expectedfloat = -147888.0f; - gotfloat = D3DXMatrixDeterminant(&mat); - ok(relative_error(gotfloat, expectedfloat ) < admitted_error, "Expected: %f, Got: %f\n", expectedfloat, gotfloat); + determinant = D3DXMatrixDeterminant(&mat); + equal = compare_float(determinant, -147888.0f, 0); + ok(equal, "Got unexpected determinant %.8e.\n", determinant); /*____________D3DXMatrixInverse______________*/ U(expectedmat).m[0][0] = 16067.0f/73944.0f; U(expectedmat).m[0][1] = -10165.0f/147888.0f; U(expectedmat).m[0][2] = -2729.0f/147888.0f; U(expectedmat).m[0][3] = -1631.0f/49296.0f; U(expectedmat).m[1][0] = -565.0f/36972.0f; U(expectedmat).m[1][1] = 2723.0f/73944.0f; U(expectedmat).m[1][2] = -1073.0f/73944.0f; U(expectedmat).m[1][3] = 289.0f/24648.0f; U(expectedmat).m[2][0] = -389.0f/2054.0f; U(expectedmat).m[2][1] = 337.0f/4108.0f; U(expectedmat).m[2][2] = 181.0f/4108.0f; U(expectedmat).m[2][3] = 317.0f/4108.0f; U(expectedmat).m[3][0] = 163.0f/5688.0f; U(expectedmat).m[3][1] = -101.0f/11376.0f; U(expectedmat).m[3][2] = -73.0f/11376.0f; U(expectedmat).m[3][3] = -127.0f/3792.0f; - expectedfloat = -147888.0f; D3DXMatrixInverse(&gotmat,&determinant,&mat); expect_matrix(&expectedmat, &gotmat, 1); - ok(relative_error( determinant, expectedfloat ) < admitted_error, "Expected: %f, Got: %f\n", expectedfloat, determinant); + equal = compare_float(determinant, -147888.0f, 0); + ok(equal, "Got unexpected determinant %.8e.\n", determinant); funcpointer = D3DXMatrixInverse(&gotmat,NULL,&mat2); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);

1 0

Henri Verbeet : d3dx9/tests: Use compare_float() in D3DXFresnelTest().
by Alexandre Julliard 03 May '17

03 May '17

Module: wine Branch: master Commit: 8034a3c6f50981c5ffbfe2743f4f112c3e5ba6d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8034a3c6f50981c5ffbfe2743… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 28 23:49:08 2017 +0200 d3dx9/tests: Use compare_float() in D3DXFresnelTest(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index c0f6bee..2712009 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -302,11 +302,12 @@ static void D3DXColorTest(void) static void D3DXFresnelTest(void) { - FLOAT expected, got; + float fresnel; + BOOL equal; - expected = 0.089187; - got = D3DXFresnelTerm(0.5f,1.5); - ok(relative_error(got, expected) < admitted_error, "Expected: %f, Got: %f\n", expected, got); + fresnel = D3DXFresnelTerm(0.5f, 1.5f); + equal = compare_float(fresnel, 8.91867056e-02f, 1); + ok(equal, "Got unexpected Fresnel term %.8e.\n", fresnel); } static void D3DXMatrixTest(void)

1 0

Paul Gofman : d3dx9: Don't call get_parameter_by_name() from get_valid_parameter() if D3DXFX_LARGEADDRESSAWARE flag is set.
by Alexandre Julliard 03 May '17

03 May '17

Module: wine Branch: master Commit: 1817f63a519633c96f7726cf52ce62560fb1feb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1817f63a519633c96f7726cf5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 28 21:24:13 2017 +0300 d3dx9: Don't call get_parameter_by_name() from get_valid_parameter() if D3DXFX_LARGEADDRESSAWARE flag is set. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 787967d..1a14edb 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -503,7 +503,7 @@ static struct d3dx_parameter *get_valid_parameter(struct d3dx9_base_effect *base sizeof(parameter_magic_string))) return handle_param; - return get_parameter_by_name(base, NULL, parameter); + return base->flags & D3DXFX_LARGEADDRESSAWARE ? NULL : get_parameter_by_name(base, NULL, parameter); } static void free_state(struct d3dx_state *state)

1 0

Paul Gofman : d3dx9: Store effect creation flags in struct d3dx_base_effect.
by Alexandre Julliard 03 May '17

03 May '17

Module: wine Branch: master Commit: a52a2d1aab877925018903334a2315d082546750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52a2d1aab877925018903334… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Apr 28 21:24:12 2017 +0300 d3dx9: Store effect creation flags in struct d3dx_base_effect. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6a5afff..787967d 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -154,6 +154,7 @@ struct d3dx9_base_effect struct d3dx_object *objects; struct d3dx_effect_pool *pool; + DWORD flags; }; struct ID3DXEffectImpl @@ -169,7 +170,7 @@ struct ID3DXEffectImpl struct d3dx_technique *active_technique; struct d3dx_pass *active_pass; BOOL started; - DWORD flags; + DWORD begin_flags; D3DLIGHT9 current_light[8]; BOOL light_updated[8]; @@ -4019,7 +4020,7 @@ static HRESULT WINAPI ID3DXEffectImpl_Begin(ID3DXEffect *iface, UINT *passes, DW *passes = technique->pass_count; effect->started = TRUE; - effect->flags = flags; + effect->begin_flags = flags; return D3D_OK; } @@ -4090,7 +4091,7 @@ static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect *iface) if (!effect->started) return D3D_OK; - if (effect->flags & D3DXFX_DONOTSAVESTATE) + if (effect->begin_flags & D3DXFX_DONOTSAVESTATE) { TRACE("State restoring disabled.\n"); } @@ -6238,6 +6239,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, base->effect = effect; base->pool = pool; + base->flags = eflags; read_dword(&ptr, &tag); TRACE("Tag: %x\n", tag);

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2017