[PATCH 0/1] MR808: d2d1/tests: Mark some more failing tests as todo.
From: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 665c3200e21..7e61ab17bed 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7268,6 +7268,7 @@ static void test_draw_geometry(BOOL d3d11) "PBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8" "FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwU" "PBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8ZDxkPGQ8ZDxk3i8A"); + todo_wine_if (!match) ok(match, "Figure does not match.\n"); match = compare_figure(&ctx, 160, 0, 160, 160, 0xff652e89, 0, "vi5kPGQ8ZDxkPGQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwU" @@ -7276,6 +7277,7 @@ static void test_draw_geometry(BOOL d3d11) "PBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8" "FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwU" "PBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8ZDxkPGQ8ZDxk3i8A"); + todo_wine_if (!match) ok(match, "Figure does not match.\n"); match = compare_figure(&ctx, 320, 0, 160, 160, 0xff652e89, 0, "vi5kPGQ8ZDxkPGQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwU" @@ -7284,6 +7286,7 @@ static void test_draw_geometry(BOOL d3d11) "PBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8" "FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwU" "PBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8ZDxkPGQ8ZDxk3i8A"); + todo_wine_if (!match) ok(match, "Figure does not match.\n"); match = compare_figure(&ctx, 480, 0, 160, 160, 0xff652e89, 0, "yC5aRlpGWjxkPGQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwU" @@ -7292,6 +7295,7 @@ static void test_draw_geometry(BOOL d3d11) "PBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8" "FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwU" "PBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8FDwUPBQ8ZDxkPGQ8ZDxk3i8A"); + todo_wine_if (!match) ok(match, "Figure does not match.\n"); match = compare_figure(&ctx, 0, 160, 160, 160, 0xff652e89, 64, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/808
Isn't this essentially masking any failures we might legitimately have later on Wine in these tests? Maybe we could limit it to todo_wine_if(!match && vendor_id == nvidia) ? There is an example of getting vendor/device for dxgi adapter in print_adapter_info() in d3d11/tests. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/808#note_8014
For example like this, and then do adapter_desc.VendorId == 0x10de in todo condition, if we need to suppress nvidia. [vendor.diff](/uploads/c59479e58e7c0b460381d6b55cfdbed0/vendor.diff) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/808#note_8017
participants (3)
-
Alexandre Julliard -
Alexandre Julliard (@julliard) -
Nikolay Sivov (@nsivov)