wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Henri Verbeet : d3dx9/tests: Cleanup expect_vec.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: c0dabf1e6d2825f58a5cc33bc0035c2e8ab2a115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0dabf1e6d2825f58a5cc33bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 26 00:11:01 2017 +0200 d3dx9/tests: Cleanup expect_vec. 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 | 62 +++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 69ca5ad..9aa1df0 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -45,6 +45,11 @@ static BOOL compare_float(float f, float g, unsigned int ulps) return TRUE; } +static BOOL compare_vec2(const D3DXVECTOR2 *v1, const D3DXVECTOR2 *v2, unsigned int ulps) +{ + return compare_float(v1->x, v2->x, ulps) && compare_float(v1->y, v2->y, ulps); +} + static BOOL compare_color(const D3DXCOLOR *c1, const D3DXCOLOR *c2, unsigned int ulps) { return compare_float(c1->r, c2->r, ulps) @@ -85,6 +90,15 @@ static BOOL compare_matrix(const D3DXMATRIX *m1, const D3DXMATRIX *m2, unsigned return TRUE; } +#define expect_vec2(expected, vector, ulps) expect_vec2_(__LINE__, expected, vector, ulps) +static void expect_vec2_(unsigned int line, const D3DXVECTOR2 *expected, const D3DXVECTOR2 *vector, unsigned int ulps) +{ + BOOL equal = compare_vec2(expected, vector, ulps); + ok_(__FILE__, line)(equal, + "Got unexpected vector {%.8e, %.8e}, expected {%.8e, %.8e}.\n", + vector->x, vector->y, expected->x, expected->y); +} + #define expect_color(expected, color, ulps) expect_color_(__LINE__, expected, color, ulps) static void expect_color_(unsigned int line, const D3DXCOLOR *expected, const D3DXCOLOR *color, unsigned int ulps) { @@ -182,8 +196,6 @@ static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const i); \ } -#define expect_vec(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error),"Expected Vector= (%f, %f)\n , Got Vector= (%f, %f)\n", expectedvec.x, expectedvec.y, gotvec.x, gotvec.y); - #define expect_vec3(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error)&&(relative_error(expectedvec.z, gotvec.z)<admitted_error),"Expected Vector= (%f, %f, %f)\n , Got Vector= (%f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, gotvec.x, gotvec.y, gotvec.z); #define expect_vec4(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error)&&(relative_error(expectedvec.z, gotvec.z)<admitted_error)&&(relative_error(expectedvec.w, gotvec.w)<admitted_error),"Expected Vector= (%f, %f, %f, %f)\n , Got Vector= (%f, %f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, expectedvec.w, gotvec.x, gotvec.y, gotvec.z, gotvec.w); @@ -1136,7 +1148,7 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Add__________________________*/ expectedvec.x = -4.0f; expectedvec.y = 13.0f; D3DXVec2Add(&gotvec,&u,&v); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec2Add(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1146,12 +1158,12 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2BaryCentric___________________*/ expectedvec.x = -12.0f; expectedvec.y = -21.0f; D3DXVec2BaryCentric(&gotvec,&u,&v,&w,coeff1,coeff2); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2CatmullRom____________________*/ expectedvec.x = 5820.25f; expectedvec.y = -3654.5625f; D3DXVec2CatmullRom(&gotvec,&u,&v,&w,&x,scale); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2CCW__________________________*/ expected = 55.0f; @@ -1180,7 +1192,7 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Hermite__________________________*/ expectedvec.x = 2604.625f; expectedvec.y = -4533.0f; D3DXVec2Hermite(&gotvec,&u,&v,&w,&x,scale); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2Length__________________________*/ expected = 5.0f; @@ -1201,20 +1213,20 @@ static void D3DXVector2Test(void) ok(relative_error(got, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, got); /*_______________D3DXVec2Lerp__________________________*/ - expectedvec.x = 68.0f; expectedvec.y = -28.5f; - D3DXVec2Lerp(&gotvec,&u,&v,scale); - expect_vec(expectedvec,gotvec); - /* Tests the case NULL */ + expectedvec.x = 68.0f; expectedvec.y = -28.5f; + D3DXVec2Lerp(&gotvec, &u, &v, scale); + expect_vec2(&expectedvec, &gotvec, 0); + /* Tests the case NULL. */ funcpointer = D3DXVec2Lerp(&gotvec,NULL,&v,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); funcpointer = D3DXVec2Lerp(NULL,NULL,NULL,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXVec2Maximize__________________________*/ - expectedvec.x = 3.0f; expectedvec.y = 9.0f; - D3DXVec2Maximize(&gotvec,&u,&v); - expect_vec(expectedvec,gotvec); - /* Tests the case NULL */ + expectedvec.x = 3.0f; expectedvec.y = 9.0f; + D3DXVec2Maximize(&gotvec, &u, &v); + expect_vec2(&expectedvec, &gotvec, 0); + /* Tests the case NULL. */ funcpointer = D3DXVec2Maximize(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); funcpointer = D3DXVec2Maximize(NULL,NULL,NULL); @@ -1223,7 +1235,7 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Minimize__________________________*/ expectedvec.x = -7.0f; expectedvec.y = 4.0f; D3DXVec2Minimize(&gotvec,&u,&v); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec2Minimize(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1233,16 +1245,16 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2Normalize_________________________*/ expectedvec.x = 0.6f; expectedvec.y = 0.8f; D3DXVec2Normalize(&gotvec,&u); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /* Test the nul vector */ expectedvec.x = 0.0f; expectedvec.y = 0.0f; D3DXVec2Normalize(&gotvec,&nul); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /*_______________D3DXVec2Scale____________________________*/ expectedvec.x = -19.5f; expectedvec.y = -26.0f; D3DXVec2Scale(&gotvec,&u,scale); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); /* Tests the case NULL */ funcpointer = D3DXVec2Scale(&gotvec,NULL,scale); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); @@ -1250,10 +1262,10 @@ static void D3DXVector2Test(void) ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); /*_______________D3DXVec2Subtract__________________________*/ - expectedvec.x = 10.0f; expectedvec.y = -5.0f; - D3DXVec2Subtract(&gotvec,&u,&v); - expect_vec(expectedvec,gotvec); - /* Tests the case NULL */ + expectedvec.x = 10.0f; expectedvec.y = -5.0f; + D3DXVec2Subtract(&gotvec, &u, &v); + expect_vec2(&expectedvec, &gotvec, 0); + /* Tests the case NULL. */ funcpointer = D3DXVec2Subtract(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); funcpointer = D3DXVec2Subtract(NULL,NULL,NULL); @@ -1270,15 +1282,15 @@ static void D3DXVector2Test(void) /*_______________D3DXVec2TransformCoord_______________________*/ expectedvec.x = 0.6f; expectedvec.y = 11.0f/15.0f; D3DXVec2TransformCoord(&gotvec, &u, &mat); - expect_vec(expectedvec, gotvec); + expect_vec2(&expectedvec, &gotvec, 1); gotvec.x = u.x; gotvec.y = u.y; D3DXVec2TransformCoord(&gotvec, (D3DXVECTOR2 *)&gotvec, &mat); - expect_vec(expectedvec, gotvec); + expect_vec2(&expectedvec, &gotvec, 1); /*_______________D3DXVec2TransformNormal______________________*/ expectedvec.x = 23.0f; expectedvec.y = 30.0f; D3DXVec2TransformNormal(&gotvec,&u,&mat); - expect_vec(expectedvec,gotvec); + expect_vec2(&expectedvec, &gotvec, 0); } static void D3DXVector3Test(void)

1 0

Henri Verbeet : d3dx9/tests: Avoid using expect_vec4 for comparing quaternions.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: cbda84abd9aeac48279d9f5d08f4aafc225330c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbda84abd9aeac48279d9f5d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 26 00:11:00 2017 +0200 d3dx9/tests: Avoid using expect_vec4 for comparing quaternions. 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 | 121 ++++++++++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbda84abd9aeac48279d9…

1 0

Henri Verbeet : d3dx9/tests: Cleanup expect_plane.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 2b9425952aabd5b49678e7feb73b0426f89cbf10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9425952aabd5b49678e7feb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 26 00:10:59 2017 +0200 d3dx9/tests: Cleanup expect_plane. 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 | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 9f40d86..85ea4a3 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -53,6 +53,14 @@ static BOOL compare_color(const D3DXCOLOR *c1, const D3DXCOLOR *c2, unsigned int && compare_float(c1->a, c2->a, ulps); } +static BOOL compare_plane(const D3DXPLANE *p1, const D3DXPLANE *p2, unsigned int ulps) +{ + return compare_float(p1->a, p2->a, ulps) + && compare_float(p1->b, p2->b, ulps) + && compare_float(p1->c, p2->c, ulps) + && compare_float(p1->d, p2->d, ulps); +} + static BOOL compare_matrix(const D3DXMATRIX *m1, const D3DXMATRIX *m2, unsigned int ulps) { unsigned int i, j; @@ -78,6 +86,15 @@ static void expect_color_(unsigned int line, const D3DXCOLOR *expected, const D3 color->r, color->g, color->b, color->a, expected->r, expected->g, expected->b, expected->a); } +#define expect_plane(expected, plane, ulps) expect_plane_(__LINE__, expected, plane, ulps) +static void expect_plane_(unsigned int line, const D3DXPLANE *expected, const D3DXPLANE *plane, unsigned int ulps) +{ + BOOL equal = compare_plane(expected, plane, ulps); + ok_(__FILE__, line)(equal, + "Got unexpected plane {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + plane->a, plane->b, plane->c, plane->d, expected->a, expected->b, expected->c, expected->d); +} + #define expect_matrix(expected, matrix, ulps) expect_matrix_(__LINE__, expected, matrix, ulps) static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const D3DXMATRIX *matrix, unsigned int ulps) { @@ -146,8 +163,6 @@ static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const i); \ } -#define expect_plane(expectedplane,gotplane) ok((relative_error(expectedplane.a, gotplane.a)<admitted_error)&&(relative_error(expectedplane.b, gotplane.b)<admitted_error)&&(relative_error(expectedplane.c, gotplane.c)<admitted_error)&&(relative_error(expectedplane.d, gotplane.d)<admitted_error),"Expected Plane= (%f, %f, %f, %f)\n , Got Plane= (%f, %f, %f, %f)\n", expectedplane.a, expectedplane.b, expectedplane.c, expectedplane.d, gotplane.a, gotplane.b, gotplane.c, gotplane.d); - #define expect_vec(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error),"Expected Vector= (%f, %f)\n , Got Vector= (%f, %f)\n", expectedvec.x, expectedvec.y, gotvec.x, gotvec.y); #define expect_vec3(expectedvec,gotvec) ok((relative_error(expectedvec.x, gotvec.x)<admitted_error)&&(relative_error(expectedvec.y, gotvec.y)<admitted_error)&&(relative_error(expectedvec.z, gotvec.z)<admitted_error),"Expected Vector= (%f, %f, %f)\n , Got Vector= (%f, %f, %f)\n", expectedvec.x, expectedvec.y, expectedvec.z, gotvec.x, gotvec.y, gotvec.z); @@ -644,14 +659,14 @@ static void D3DXPlaneTest(void) vec2.x = 17.0f; vec2.y = 31.0f; vec2.z = 24.0f; expectedplane.a = 17.0f; expectedplane.b = 31.0f; expectedplane.c = 24.0f; expectedplane.d = -950.0f; D3DXPlaneFromPointNormal(&gotplane, &vec1, &vec2); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 0); gotplane.a = vec2.x; gotplane.b = vec2.y; gotplane.c = vec2.z; D3DXPlaneFromPointNormal(&gotplane, &vec1, (D3DXVECTOR3 *)&gotplane); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 0); gotplane.a = vec1.x; gotplane.b = vec1.y; gotplane.c = vec1.z; expectedplane.d = -1826.0f; D3DXPlaneFromPointNormal(&gotplane, (D3DXVECTOR3 *)&gotplane, &vec2); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 0); /*_______________D3DXPlaneFromPoints_______*/ vec1.x = 1.0f; vec1.y = 2.0f; vec1.z = 3.0f; @@ -659,7 +674,7 @@ static void D3DXPlaneTest(void) vec3.x = 83.0f; vec3.y = 74.0f; vec3.z = 65.0f; expectedplane.a = 0.085914f; expectedplane.b = -0.704492f; expectedplane.c = 0.704492f; expectedplane.d = -0.790406f; D3DXPlaneFromPoints(&gotplane,&vec1,&vec2,&vec3); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 64); /*_______________D3DXPlaneIntersectLine___________*/ vec1.x = 9.0f; vec1.y = 6.0f; vec1.z = 3.0f; @@ -677,16 +692,16 @@ static void D3DXPlaneTest(void) /*_______________D3DXPlaneNormalize______________*/ expectedplane.a = -3.0f/sqrt(26.0f); expectedplane.b = -1.0f/sqrt(26.0f); expectedplane.c = 4.0f/sqrt(26.0f); expectedplane.d = 7.0/sqrt(26.0f); D3DXPlaneNormalize(&gotplane, &plane); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 2); nulplane.a = 0.0; nulplane.b = 0.0f, nulplane.c = 0.0f; nulplane.d = 0.0f; expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; D3DXPlaneNormalize(&gotplane, &nulplane); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 0); /*_______________D3DXPlaneTransform____________*/ expectedplane.a = 49.0f; expectedplane.b = -98.0f; expectedplane.c = 55.0f; expectedplane.d = -165.0f; D3DXPlaneTransform(&gotplane,&plane,&mat); - expect_plane(expectedplane, gotplane); + expect_plane(&expectedplane, &gotplane, 0); } static void D3DXQuaternionTest(void)

1 0

Józef Kucia : d3d11/tests: Extend test for ID3DDeviceContextState.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: faecb8eda4b0360f5d60d3a989fb3cfed779df0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=faecb8eda4b0360f5d60d3a98… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:59 2017 +0200 d3d11/tests: Extend test for ID3DDeviceContextState. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a692473..23fbecf 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5314,6 +5314,9 @@ static void test_device_context_state(void) return; } + check_interface(device, &IID_ID3D10Device, FALSE, FALSE); + check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); + feature_level = ID3D11Device1_GetFeatureLevel(device); ID3D11Device1_GetImmediateContext1(device, &context); @@ -5334,7 +5337,7 @@ static void test_device_context_state(void) ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); - tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; + tmp_sampler = NULL; ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); ID3D11SamplerState_Release(tmp_sampler); @@ -5347,7 +5350,7 @@ static void test_device_context_state(void) ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); /* Enable ID3D10Device behavior. */ - previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; + previous_context_state = NULL; ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); refcount = ID3DDeviceContextState_Release(context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); @@ -5358,18 +5361,35 @@ static void test_device_context_state(void) ok(tmp_sampler == (ID3D11SamplerState *)0xdeadbeef, "Got unexpected sampler %p.\n", tmp_sampler); ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); + check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &context_state); refcount = ID3DDeviceContextState_Release(context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); refcount = ID3DDeviceContextState_Release(previous_context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); - ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); + /* ID3DDeviceContextState retains the previous state. */ + tmp_sampler = NULL; + ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + tmp_sampler = NULL; + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); + ok(!tmp_sampler, "Got unexpected sampler %p.\n", tmp_sampler); + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &sampler); + tmp_sampler = NULL; + ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); ID3D11SamplerState_Release(tmp_sampler); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); + check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11SamplerState_Release(sampler); ID3D11DeviceContext1_Release(context); refcount = ID3D11Device1_Release(device);

1 0

Józef Kucia : d3d11/tests: Introduce check_interface( ) helper.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 31f9c920b7b93b19de4a9e1b55f0163ef07d5307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f9c920b7b93b19de4a9e1b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:58 2017 +0200 d3d11/tests: Introduce check_interface() helper. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 214 ++++++++++++++++------------------------------- 1 file changed, 73 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31f9c920b7b93b19de4a9…

1 0

Józef Kucia : d3d11: Fix refcounting for shaders.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 51d58f9962c92bb2268143383499b1e9b68d12fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d58f9962c92bb2268143383… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:57 2017 +0200 d3d11: Fix refcounting for shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/shader.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 6266a34..b8c50d9 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -635,6 +635,14 @@ static ULONG STDMETHODCALLTYPE d3d11_hull_shader_AddRef(ID3D11HullShader *iface) TRACE("%p increasing refcount to %u.\n", shader, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(shader->device); + wined3d_mutex_lock(); + wined3d_shader_incref(shader->wined3d_shader); + wined3d_mutex_unlock(); + } + return refcount; } @@ -831,6 +839,14 @@ static ULONG STDMETHODCALLTYPE d3d11_domain_shader_AddRef(ID3D11DomainShader *if TRACE("%p increasing refcount to %u.\n", shader, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(shader->device); + wined3d_mutex_lock(); + wined3d_shader_incref(shader->wined3d_shader); + wined3d_mutex_unlock(); + } + return refcount; } @@ -1037,6 +1053,14 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_AddRef(ID3D11GeometryShader TRACE("%p increasing refcount to %u.\n", shader, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(shader->device); + wined3d_mutex_lock(); + wined3d_shader_incref(shader->wined3d_shader); + wined3d_mutex_unlock(); + } + return refcount; } @@ -1890,6 +1914,14 @@ static ULONG STDMETHODCALLTYPE d3d11_compute_shader_AddRef(ID3D11ComputeShader * TRACE("%p increasing refcount to %u.\n", shader, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(shader->device); + wined3d_mutex_lock(); + wined3d_shader_incref(shader->wined3d_shader); + wined3d_mutex_unlock(); + } + return refcount; }

1 0

Józef Kucia : d3d11/tests: Add test for state refcounting.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: df5576f3cd7a611b7088dfcf0fd7a3f53d8fbda4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5576f3cd7a611b7088dfcf0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:42:07 2017 +0200 d3d11/tests: Add test for state refcounting. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5d3b818..97e7775 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18,6 +18,7 @@ */ #include <assert.h> +#include <float.h> #include <stdlib.h> #define COBJMACROS #include "initguid.h" @@ -5291,6 +5292,70 @@ static void test_private_data(void) ok(!refcount, "Test object has %u references left.\n", refcount); } +static void test_state_refcounting(const D3D_FEATURE_LEVEL feature_level) +{ + ID3D11SamplerState *sampler, *tmp_sampler; + D3D11_SAMPLER_DESC sampler_desc; + struct device_desc device_desc; + ID3D11DeviceContext *context; + ID3D11Device *device; + ULONG refcount; + HRESULT hr; + + device_desc.feature_level = &feature_level; + device_desc.flags = 0; + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device for feature level %#x.\n", feature_level); + return; + } + + ID3D11Device_GetImmediateContext(device, &context); + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; + sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP; + sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_WRAP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_WRAP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 1.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 1.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = FLT_MAX; + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &tmp_sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + ID3D11SamplerState_Release(tmp_sampler); + + tmp_sampler = sampler; + refcount = get_refcount(sampler); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler); + refcount = ID3D11SamplerState_Release(sampler); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + sampler = NULL; + ID3D11DeviceContext_PSGetSamplers(context, 0, 1, &sampler); + ok(sampler == tmp_sampler, "Got sampler %p, expected %p.\n", sampler, tmp_sampler); + refcount = ID3D11SamplerState_Release(sampler); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &tmp_sampler); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + ok(tmp_sampler == sampler, "Got sampler %p, expected %p.\n", tmp_sampler, sampler); + refcount = ID3D11SamplerState_Release(tmp_sampler); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_device_context_state(void) { ID3DDeviceContextState *context_state, *previous_context_state; @@ -17679,6 +17744,7 @@ START_TEST(d3d11) test_timestamp_query(); test_device_removed_reason(); test_private_data(); + run_for_each_feature_level(test_state_refcounting); test_device_context_state(); test_blend(); test_texture();

1 0

Józef Kucia : d3d11: Delay destroying sampler state until it is no longer referenced.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 5813b93185aeb26ff0fca105d320cb92a9c39af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5813b93185aeb26ff0fca105d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:55 2017 +0200 d3d11: Delay destroying sampler state until it is no longer referenced. Implements D3D11 behavior. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index c8e443f..b85bd67 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -947,6 +947,14 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_AddRef(ID3D11SamplerState *if TRACE("%p increasing refcount to %u.\n", state, refcount); + if (refcount == 1) + { + ID3D11Device_AddRef(state->device); + wined3d_mutex_lock(); + wined3d_sampler_incref(state->wined3d_sampler); + wined3d_mutex_unlock(); + } + return refcount; } @@ -959,15 +967,13 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_Release(ID3D11SamplerState *i if (!refcount) { - struct d3d_device *device = impl_from_ID3D11Device(state->device); + ID3D11Device *device = state->device; wined3d_mutex_lock(); wined3d_sampler_decref(state->wined3d_sampler); - wine_rb_remove(&device->sampler_states, &state->entry); - ID3D11Device_Release(state->device); - wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, state); + + ID3D11Device_Release(device); } return refcount; @@ -1146,6 +1152,21 @@ static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = d3d10_sampler_state_GetDesc, }; +static void STDMETHODCALLTYPE d3d_sampler_wined3d_object_destroyed(void *parent) +{ + struct d3d_sampler_state *state = parent; + struct d3d_device *device = impl_from_ID3D11Device(state->device); + + wine_rb_remove(&device->sampler_states, &state->entry); + wined3d_private_store_cleanup(&state->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d_sampler_wined3d_parent_ops = +{ + d3d_sampler_wined3d_object_destroyed, +}; + static enum wined3d_texture_address wined3d_texture_address_from_d3d11(enum D3D11_TEXTURE_ADDRESS_MODE t) { return (enum wined3d_texture_address)t; @@ -1212,7 +1233,7 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic wined3d_desc.srgb_decode = TRUE; if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, - state, &d3d_null_wined3d_parent_ops, &state->wined3d_sampler))) + state, &d3d_sampler_wined3d_parent_ops, &state->wined3d_sampler))) { WARN("Failed to create wined3d sampler, hr %#x.\n", hr); wined3d_private_store_cleanup(&state->private_store);

1 0

Józef Kucia : wined3d: Add parent ops for sampler objects.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 5b0fe9cee5b88563d9e30849a6c1c362519191bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b0fe9cee5b88563d9e30849a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:54 2017 +0200 wined3d: Add parent ops for sampler objects. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/state.c | 3 ++- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/sampler.c | 10 +++++++--- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- include/wine/wined3d.h | 2 +- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 0a16e58..c8e443f 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -1211,7 +1211,8 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic wined3d_desc.comparison_func = wined3d_cmp_func_from_d3d11(desc->ComparisonFunc); wined3d_desc.srgb_decode = TRUE; - if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, state, &state->wined3d_sampler))) + if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, + state, &d3d_null_wined3d_parent_ops, &state->wined3d_sampler))) { WARN("Failed to create wined3d sampler, hr %#x.\n", hr); wined3d_private_store_cleanup(&state->private_store); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c901e9f..9499f6e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -786,7 +786,7 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 * sampler object is used to emulate the direct resource access when there is no sampler state * to use. */ - if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &device->default_sampler))) + if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &wined3d_null_parent_ops, &device->default_sampler))) { ERR("Failed to create default sampler, hr %#x.\n", hr); device->default_sampler = NULL; @@ -799,7 +799,7 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 desc.mag_filter = WINED3D_TEXF_LINEAR; desc.min_filter = WINED3D_TEXF_LINEAR; desc.mip_filter = WINED3D_TEXF_LINEAR; - if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &device->null_sampler))) + if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &wined3d_null_parent_ops, &device->null_sampler))) { ERR("Failed to create null sampler, hr %#x.\n", hr); device->null_sampler = NULL; diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 294d766..86d23a0 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -57,7 +57,10 @@ ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) TRACE("%p decreasing refcount to %u.\n", sampler, refcount); if (!refcount) + { + sampler->parent_ops->wined3d_object_destroyed(sampler->parent); wined3d_cs_destroy_object(sampler->device->cs, wined3d_sampler_destroy_object, sampler); + } return refcount; } @@ -112,11 +115,12 @@ static void wined3d_sampler_cs_init(void *object) } static void wined3d_sampler_init(struct wined3d_sampler *sampler, struct wined3d_device *device, - const struct wined3d_sampler_desc *desc, void *parent) + const struct wined3d_sampler_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { sampler->refcount = 1; sampler->device = device; sampler->parent = parent; + sampler->parent_ops = parent_ops; sampler->desc = *desc; if (device->adapter->gl_info.supported[ARB_SAMPLER_OBJECTS]) @@ -124,7 +128,7 @@ static void wined3d_sampler_init(struct wined3d_sampler *sampler, struct wined3d } HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, - void *parent, struct wined3d_sampler **sampler) + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_sampler **sampler) { struct wined3d_sampler *object; @@ -143,7 +147,7 @@ HRESULT CDECL wined3d_sampler_create(struct wined3d_device *device, const struct if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - wined3d_sampler_init(object, device, desc, parent); + wined3d_sampler_init(object, device, desc, parent, parent_ops); TRACE("Created sampler %p.\n", object); *sampler = object; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 531dd98..12ef3bb 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3616,7 +3616,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state } else { - if (FAILED(wined3d_sampler_create(device, &desc, NULL, &sampler))) + if (FAILED(wined3d_sampler_create(device, &desc, NULL, &wined3d_null_parent_ops, &sampler))) { ERR("Failed to create sampler.\n"); return; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9b8de3e..0f27de3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -223,7 +223,7 @@ @ cdecl wined3d_rendertarget_view_incref(ptr) @ cdecl wined3d_rendertarget_view_set_parent(ptr ptr) -@ cdecl wined3d_sampler_create(ptr ptr ptr ptr) +@ cdecl wined3d_sampler_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_sampler_decref(ptr) @ cdecl wined3d_sampler_get_parent(ptr) @ cdecl wined3d_sampler_incref(ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 357ceed..751f092 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3110,10 +3110,11 @@ struct wined3d_sampler { struct wine_rb_entry entry; LONG refcount; + GLuint name; struct wined3d_device *device; void *parent; + const struct wined3d_parent_ops *parent_ops; struct wined3d_sampler_desc desc; - GLuint name; }; void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0d85cb4..2d69e98 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2531,7 +2531,7 @@ ULONG __cdecl wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view void __cdecl wined3d_rendertarget_view_set_parent(struct wined3d_rendertarget_view *view, void *parent); HRESULT __cdecl wined3d_sampler_create(struct wined3d_device *device, const struct wined3d_sampler_desc *desc, - void *parent, struct wined3d_sampler **sampler); + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_sampler **sampler); ULONG __cdecl wined3d_sampler_decref(struct wined3d_sampler *sampler); void * __cdecl wined3d_sampler_get_parent(const struct wined3d_sampler *sampler); ULONG __cdecl wined3d_sampler_incref(struct wined3d_sampler *sampler);

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DSSetSamplers().
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: aff0026e688433ed2fbffd2c60efae856f79c75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff0026e688433ed2fbffd2c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:53 2017 +0200 d3d11: Implement d3d11_immediate_context_DSSetSamplers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b6031b4..095908d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1242,8 +1242,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct d3d_sampler_state *sampler = unsafe_impl_from_ID3D11SamplerState(samplers[i]); + + wined3d_device_set_ds_sampler(device->wined3d_device, start_slot + i, + sampler ? sampler->wined3d_sampler : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetConstantBuffers(ID3D11DeviceContext *iface,

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
76
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 April 2017