wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added patch to avoid some test failures in d3d11 / d3d10core tests.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-02-18 21:52:53 +01:00
parent d9d5df9f73
commit 81e2fbadc8
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
patches/d3d9-Tests/0003-d3d11-tests-Avoid-test-failures.patch Normal file
View File

@ -0,0 +1,64 @@
From e0161e996c9a748d285111b5f30e56e73a808c43 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
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(+)
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
--- 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)
ID3D11DeviceContext_Dispatch(context, 1, 1, 1);
get_buffer_readback(raw_buffer, &rb);
data = get_readback_color(&rb, 0, 0);
+ todo_wine
ok(data == 0xffff, "Got unexpected result %#x.\n", data);
data = get_readback_color(&rb, 1, 0);
+ todo_wine
ok(data == 0xa, "Got unexpected result %#x.\n", data);
release_resource_readback(&rb);
--
2.11.0

4
patches/patchinstall.sh
View File

@ -3250,14 +3250,16 @@ fi
# Patchset d3d9-Tests
# |
# | Modified files:
# | * dlls/d3d9/tests/device.c, dlls/d3d9/tests/visual.c
# | * dlls/d3d10core/tests/device.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
patch_apply d3d9-Tests/0002-d3d9-tests-Avoid-crash-when-surface-and-texture-crea.patch
patch_apply d3d9-Tests/0003-d3d11-tests-Avoid-test-failures.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "d3d9/tests: Avoid test failures on specific Nvidia graphic cards.", 1 },';
printf '%s\n' '+ { "Christian Costa", "d3d9/tests: Avoid crash when surface and texture creation fails.", 1 },';
printf '%s\n' '+ { "Sebastian Lackner", "d3d11/tests: Avoid test failures.", 1 },';
) >> "$patchlist"
fi