Module: wine Branch: master Commit: c0a14564d33aad52c4500b90da8eea3f0810283d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a14564d33aad52c4500b90da...
Author: Stefan Dösinger stefan@codeweavers.com Date: Tue Sep 10 12:14:04 2013 +0200
d3d9/tests: Actually accept r500 results.
---
dlls/d3d9/tests/visual.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b856c93..cb04c01 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12728,11 +12728,12 @@ static void fp_special_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr);
color = getPixelColor(device, 320, 240); - ok(color_match(color, vs_body[i].r600, 1) + ok(color_match(color, vs_body[i].r500, 1) + || color_match(color, vs_body[i].r600, 1) || color_match(color, vs_body[i].nv40, 1) || color_match(color, vs_body[i].nv50, 1), - "Expected color 0x%08x, 0x%08x or 0x%08x for instruction "%s", got 0x%08x.\n", - vs_body[i].r600, vs_body[i].nv40, vs_body[i].nv50, vs_body[i].name, color); + "Expected color 0x%08x, 0x%08x, 0x%08x or 0x%08x for instruction "%s", got 0x%08x.\n", + vs_body[i].r500, vs_body[i].r600, vs_body[i].nv40, vs_body[i].nv50, vs_body[i].name, color);
hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr);
-
Alexandre Julliard