Module: wine Branch: master Commit: b245c37ce64489c23e7f4d2cb6b483eaac1bbbaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b245c37ce64489c23e7f4d2cb6...
Author: Stefan Dösinger stefan@codeweavers.com Date: Sat Apr 5 15:16:54 2008 +0200
d3d9: Accept nvidia hardware vp garbage.
Apparently nvidia cards do not like 3.0 vshader + fixed function fragment processing, so accept their result. This has no implementation implications for Wine because we need the code to support the 3.0+ffp combination to handle 3.0+1.x and 3.0+2.0 shader combinations too
---
dlls/d3d9/tests/visual.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a38e2d7..7b35c60 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5625,9 +5625,10 @@ static void pshader_version_varying_test(IDirect3DDevice9 *device) { (color & 0x000000ff) == 0x00000000, "ps_2_0 returned color 0x%08x, expected 0x00203300\n", color); color = getPixelColor(device, 480, 160); - ok((color & 0x00ff0000) >= 0x00190000 && (color & 0x00ff0000) <= 0x00210000 && + ok( color == 0x00ffffff /* Nvidia driver garbage with HW vp */ || ( + (color & 0x00ff0000) >= 0x00190000 && (color & 0x00ff0000) <= 0x00210000 && (color & 0x0000ff00) >= 0x00003200 && (color & 0x0000ff00) <= 0x00003400 && - (color & 0x000000ff) == 0x00000000, + (color & 0x000000ff) == 0x00000000), "fixed function fragment processing returned color 0x%08x, expected 0x00203300\n", color);
/* cleanup */
-
Alexandre Julliard