Module: wine Branch: master Commit: 9ce5b4096fd6ccab6ea9fac5f7033db09cd2167a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce5b4096fd6ccab6ea9fac5f7...
Author: Stefan Dösinger stefan@codeweavers.com Date: Fri Apr 21 22:47:55 2017 +0200
d3d9/tests: WARP returns a random color in uninitialized color attributes.
ea8ba70a made the broken(warp) condition too strict. This patch reverts back to the old behavior of accepting any result from WARP.
Signed-off-by: Stefan Dösinger stefan@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d9/tests/visual.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f9b147e..25aa35b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8087,14 +8087,13 @@ static void test_vshader_input(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);
- /* WARP and r500 return a color from a previous draw. In case of WARP it is the last draw, which happens to - * be the one with quad4_color above. AMD's r500 uses the last D3DCOLOR attribute, which is the one from - * quad3_color. + /* WARP and r500 return a color from a previous draw. In case of WARP it is random, although most of the + * time it is the color of the last draw, which happens to be the one with quad4_color above. AMD's r500 + * uses the last D3DCOLOR attribute, which is the one from quad3_color. * * Newer AMD cards and Nvidia return zero. */ color = getPixelColor(device, 160, 360); - ok(color_match(color, 0x00000000, 1) || broken(color_match(color, 0x00ff8040, 1)) - || broken(color_match(color, 0x00ffff00, 1) && warp), + ok(color_match(color, 0x00000000, 1) || broken(color_match(color, 0x00ff8040, 1)) || broken(warp), "Got unexpected color 0x%08x for no color attribute test.\n", color);
IDirect3DDevice9_SetVertexShader(device, NULL);