From 147562e3e15aec2e6a655e2f2ab580a7c6175612 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 25 Feb 2017 02:29:49 +0100 Subject: [PATCH] d3d9-Tests: Remove some todo_wines. Probably fixed by cab9282d10e4b2868a0dd85383b1126c0d6c591a. --- ...0003-d3d11-tests-Avoid-test-failures.patch | 47 ++-------------- patches/patchinstall.sh | 12 ++-- ...it-for-events-that-have-not-been-iss.patch | 56 +++---------------- .../wined3d-CSMT_Main/9999-IfDefined.patch | 46 --------------- 4 files changed, 18 insertions(+), 143 deletions(-) diff --git a/patches/d3d9-Tests/0003-d3d11-tests-Avoid-test-failures.patch b/patches/d3d9-Tests/0003-d3d11-tests-Avoid-test-failures.patch index 7f2fe3a8..c489bd65 100644 --- a/patches/d3d9-Tests/0003-d3d11-tests-Avoid-test-failures.patch +++ b/patches/d3d9-Tests/0003-d3d11-tests-Avoid-test-failures.patch @@ -1,54 +1,17 @@ -From e0161e996c9a748d285111b5f30e56e73a808c43 Mon Sep 17 00:00:00 2001 +From 623008778ae6b9ebe5903d71f1e09abefca7ae65 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 18 Feb 2017 21:50:33 +0100 Subject: d3d11/tests: Avoid test failures. --- - dlls/d3d10core/tests/device.c | 2 ++ - dlls/d3d11/tests/d3d11.c | 4 ++++ - 2 files changed, 6 insertions(+) + dlls/d3d11/tests/d3d11.c | 2 ++ + 1 file changed, 2 insertions(+) -diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c -index 7b27d9f6a4c..a4b6355d6b9 100644 ---- a/dlls/d3d10core/tests/device.c -+++ b/dlls/d3d10core/tests/device.c -@@ -7821,6 +7821,7 @@ float4 main(const ps_in v) : SV_TARGET - ID3D10Device_Draw(device, 4, 0); - - color = get_texture_color(test_context.backbuffer, 319, 239); -+ todo_wine_if(test_data[i].index == 1) - ok(compare_color(color, test_data[i].expected, 1), - "Got unexpected color 0x%08x for index %d.\n", color, test_data[i].index); - } -@@ -9989,6 +9990,7 @@ static void test_line_antialiasing_blending(void) - - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &green.x); - draw_color_quad(&test_context, &red); -+ todo_wine - check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); - - ID3D10Device_OMSetBlendState(device, NULL, NULL, D3D10_DEFAULT_SAMPLE_MASK); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c -index a1561610dca..bcaa5df3f39 100644 +index 8f37304b5e..64df74f671 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c -@@ -9776,6 +9776,7 @@ float4 main(const ps_in v) : SV_TARGET - ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)index_cb, 0, NULL, &index, 0, 0); - - draw_quad(&test_context); -+ todo_wine_if(test_data[i].index == 1) - check_texture_color(test_context.backbuffer, test_data[i].expected, 1); - } - -@@ -12027,6 +12028,7 @@ static void test_line_antialiasing_blending(void) - - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &green.x); - draw_color_quad(&test_context, &red); -+ todo_wine - check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); - - ID3D11DeviceContext_OMSetBlendState(context, NULL, NULL, D3D11_DEFAULT_SAMPLE_MASK); -@@ -15265,8 +15267,10 @@ static void test_unaligned_raw_buffer_access(void) +@@ -14609,8 +14609,10 @@ static void test_unaligned_raw_buffer_access(const D3D_FEATURE_LEVEL feature_lev ID3D11DeviceContext_Dispatch(context, 1, 1, 1); get_buffer_readback(raw_buffer, &rb); data = get_readback_color(&rb, 0, 0); diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 02670273..68ab192b 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -3252,7 +3252,7 @@ fi # Patchset d3d9-Tests # | # | Modified files: -# | * dlls/d3d10core/tests/device.c, dlls/d3d11/tests/d3d11.c, dlls/d3d9/tests/device.c, dlls/d3d9/tests/visual.c +# | * dlls/d3d11/tests/d3d11.c, dlls/d3d9/tests/device.c, dlls/d3d9/tests/visual.c # | if test "$enable_d3d9_Tests" -eq 1; then patch_apply d3d9-Tests/0001-d3d9-tests-Avoid-test-failures-on-specific-Nvidia-graphic-.patch @@ -8373,11 +8373,11 @@ fi # | * [#11674] Support for CSMT (command stream) to increase graphic performance # | # | Modified files: -# | * dlls/d3d10core/tests/device.c, dlls/d3d11/tests/d3d11.c, dlls/d3d9/tests/visual.c, dlls/wined3d/arb_program_shader.c, -# | dlls/wined3d/buffer.c, dlls/wined3d/context.c, dlls/wined3d/cs.c, dlls/wined3d/device.c, dlls/wined3d/drawprim.c, -# | dlls/wined3d/glsl_shader.c, dlls/wined3d/query.c, dlls/wined3d/resource.c, dlls/wined3d/shader.c, dlls/wined3d/state.c, -# | dlls/wined3d/stateblock.c, dlls/wined3d/surface.c, dlls/wined3d/swapchain.c, dlls/wined3d/texture.c, -# | dlls/wined3d/utils.c, dlls/wined3d/view.c, dlls/wined3d/wined3d_main.c, dlls/wined3d/wined3d_private.h +# | * dlls/d3d9/tests/visual.c, dlls/wined3d/arb_program_shader.c, dlls/wined3d/buffer.c, dlls/wined3d/context.c, +# | dlls/wined3d/cs.c, dlls/wined3d/device.c, dlls/wined3d/drawprim.c, dlls/wined3d/glsl_shader.c, dlls/wined3d/query.c, +# | dlls/wined3d/resource.c, dlls/wined3d/shader.c, dlls/wined3d/state.c, dlls/wined3d/stateblock.c, dlls/wined3d/surface.c, +# | dlls/wined3d/swapchain.c, dlls/wined3d/texture.c, dlls/wined3d/utils.c, dlls/wined3d/view.c, +# | dlls/wined3d/wined3d_main.c, dlls/wined3d/wined3d_private.h # | if test "$enable_wined3d_CSMT_Main" -eq 1; then patch_apply wined3d-CSMT_Main/9999-IfDefined.patch diff --git a/patches/wined3d-CSMT_Main/0041-wined3d-Don-t-wait-for-events-that-have-not-been-iss.patch b/patches/wined3d-CSMT_Main/0041-wined3d-Don-t-wait-for-events-that-have-not-been-iss.patch index 2d634e05..adf08c4c 100644 --- a/patches/wined3d-CSMT_Main/0041-wined3d-Don-t-wait-for-events-that-have-not-been-iss.patch +++ b/patches/wined3d-CSMT_Main/0041-wined3d-Don-t-wait-for-events-that-have-not-been-iss.patch @@ -1,61 +1,19 @@ -From 4e9409d9486ec3598e513f6f5a4a7f1188eb55c6 Mon Sep 17 00:00:00 2001 +From 6e41725a162f9ad5acc17733be62667570435c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 18 Feb 2017 00:45:39 +0100 Subject: wined3d: Don't wait for events that have not been issued yet. --- - dlls/d3d10core/tests/device.c | 2 -- - dlls/d3d11/tests/d3d11.c | 2 -- dlls/wined3d/cs.c | 4 ++++ dlls/wined3d/query.c | 6 +++++- dlls/wined3d/wined3d_private.h | 1 + - 5 files changed, 10 insertions(+), 5 deletions(-) + 3 files changed, 10 insertions(+), 1 deletion(-) -diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c -index a4b6355d6b9..7b27d9f6a4c 100644 ---- a/dlls/d3d10core/tests/device.c -+++ b/dlls/d3d10core/tests/device.c -@@ -7821,7 +7821,6 @@ float4 main(const ps_in v) : SV_TARGET - ID3D10Device_Draw(device, 4, 0); - - color = get_texture_color(test_context.backbuffer, 319, 239); -- todo_wine_if(test_data[i].index == 1) - ok(compare_color(color, test_data[i].expected, 1), - "Got unexpected color 0x%08x for index %d.\n", color, test_data[i].index); - } -@@ -9990,7 +9989,6 @@ static void test_line_antialiasing_blending(void) - - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &green.x); - draw_color_quad(&test_context, &red); -- todo_wine - check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); - - ID3D10Device_OMSetBlendState(device, NULL, NULL, D3D10_DEFAULT_SAMPLE_MASK); -diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c -index bcaa5df3f39..4ebb82d98de 100644 ---- a/dlls/d3d11/tests/d3d11.c -+++ b/dlls/d3d11/tests/d3d11.c -@@ -9776,7 +9776,6 @@ float4 main(const ps_in v) : SV_TARGET - ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)index_cb, 0, NULL, &index, 0, 0); - - draw_quad(&test_context); -- todo_wine_if(test_data[i].index == 1) - check_texture_color(test_context.backbuffer, test_data[i].expected, 1); - } - -@@ -12028,7 +12027,6 @@ static void test_line_antialiasing_blending(void) - - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &green.x); - draw_color_quad(&test_context, &red); -- todo_wine - check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); - - ID3D11DeviceContext_OMSetBlendState(context, NULL, NULL, D3D11_DEFAULT_SAMPLE_MASK); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c -index 41167f49ace..fba963f045d 100644 +index 91089ff9df..4086e3c7f3 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c -@@ -1641,11 +1641,15 @@ static UINT wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) +@@ -1784,11 +1784,15 @@ static UINT wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_query_issue *op = data; struct wined3d_query *query = op->query; @@ -72,7 +30,7 @@ index 41167f49ace..fba963f045d 100644 } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c -index 2db6fa8c10d..d6264cec01b 100644 +index 2db6fa8c10..d6264cec01 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -351,8 +351,12 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, @@ -90,10 +48,10 @@ index 2db6fa8c10d..d6264cec01b 100644 return S_FALSE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h -index 10a7b4a8660..7462a3382ca 100644 +index 747153e24f..69c3f9b48c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h -@@ -1501,6 +1501,7 @@ struct wined3d_query +@@ -1507,6 +1507,7 @@ struct wined3d_query DWORD data_size; const struct wined3d_query_ops *query_ops; LONG pending; diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 7e30210b..31cac960 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -8,52 +8,6 @@ Based on patches by: Stefan Dösinger Stefan Dösinger -diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c ---- a/dlls/d3d10core/tests/device.c -+++ b/dlls/d3d10core/tests/device.c -@@ -7821,7 +7821,9 @@ float4 main(const ps_in v) : SV_TARGET - ID3D10Device_Draw(device, 4, 0); - - color = get_texture_color(test_context.backbuffer, 319, 239); -+#if !defined(STAGING_CSMT) - todo_wine_if(test_data[i].index == 1) -+#endif /* STAGING_CSMT */ - ok(compare_color(color, test_data[i].expected, 1), - "Got unexpected color 0x%08x for index %d.\n", color, test_data[i].index); - } -@@ -9990,7 +9992,9 @@ static void test_line_antialiasing_blending(void) - - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &green.x); - draw_color_quad(&test_context, &red); -+#if !defined(STAGING_CSMT) - todo_wine -+#endif /* STAGING_CSMT */ - check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); - - ID3D10Device_OMSetBlendState(device, NULL, NULL, D3D10_DEFAULT_SAMPLE_MASK); -diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c ---- a/dlls/d3d11/tests/d3d11.c -+++ b/dlls/d3d11/tests/d3d11.c -@@ -9134,7 +9134,9 @@ float4 main(const ps_in v) : SV_TARGET - ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)index_cb, 0, NULL, &index, 0, 0); - - draw_quad(&test_context); -+#if !defined(STAGING_CSMT) - todo_wine_if(test_data[i].index == 1) -+#endif /* STAGING_CSMT */ - check_texture_color(test_context.backbuffer, test_data[i].expected, 1); - } - -@@ -11386,7 +11388,9 @@ static void test_line_antialiasing_blending(void) - - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &green.x); - draw_color_quad(&test_context, &red); -+#if !defined(STAGING_CSMT) - todo_wine -+#endif /* STAGING_CSMT */ - check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); - - ID3D11DeviceContext_OMSetBlendState(context, NULL, NULL, D3D11_DEFAULT_SAMPLE_MASK); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c