[PATCH 0/2] MR2473: d3d10core/tests, d3d11/tests: Add a broken() case for WARP in test_occlusion_query().

[PATCH 1/2] d3d10core/tests: Add a broken() case for WARP in test_occlusion_query().

[Zebediah Figura]

From: Zebediah Figura

Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53252
---
 dlls/d3d10core/tests/d3d10core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c
index 38a67eac5f9..bb68c5f2989 100644
--- a/dlls/d3d10core/tests/d3d10core.c
+++ b/dlls/d3d10core/tests/d3d10core.c
@@ -4683,7 +4683,10 @@ static void test_occlusion_query(void)

ID3D10Asynchronous_End(query);
     get_query_data(query, &data, sizeof(data));
-    ok(data.uint == 640 * 480, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]);
+    /* WARP devices randomly return zero as if the draw did not happen, much
+     * like in test_pipeline_statistics_query(). */
+    ok(data.uint == 640 * 480 || broken(is_warp_device(device) && !data.uint),
+            "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]);

memset(&data, 0xff, sizeof(data));
     hr = ID3D10Asynchronous_GetData(query, &data, sizeof(DWORD), 0);

[PATCH 2/2] d3d11/tests: Add a broken() case for WARP in test_occlusion_query().

[Zebediah Figura]

From: Zebediah Figura

Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53252
---
 dlls/d3d11/tests/d3d11.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 9bb585f8c13..f6623614583 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -6011,7 +6011,10 @@ static void test_occlusion_query(void)

ID3D11DeviceContext_End(context, query);
     get_query_data(context, query, &data, sizeof(data));
-    ok(data.uint == 640 * 480, "Got unexpected query result 0x%08lx%08lx.\n", data.dword[1], data.dword[0]);
+    /* WARP devices randomly return zero as if the draw did not happen, much
+     * like in test_pipeline_statistics_query(). */
+    ok(data.uint == 640 * 480 || broken(is_warp_device(device) && !data.uint),
+            "Got unexpected query result 0x%08lx%08lx.\n", data.dword[1], data.dword[0]);

memset(&data, 0xff, sizeof(data));
     hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(DWORD), 0);

[PATCH 0/2] MR2473: d3d10core/tests, d3d11/tests: Add a broken() case for WARP in test_occlusion_query(). - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.