[PATCH 2/5] d3d9/tests: Fix the expected value for the "blendindices" test in pretransformed_varying_test().

Henri Verbeet hverbeet at codeweavers.com
Fri Nov 1 03:40:59 CDT 2013


0x00333333 makes much more sense than 0x00000000, and is what most of my
hardware returns. Apparently at least some GF7 cards (still) return
0x00000000, so also accept that as broken().
---
 dlls/d3d9/tests/visual.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 246dd07..44755ec 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -6398,7 +6398,7 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device)
 
     struct varying_test_struct tests[] = {
        {blendweight_code,       NULL,       0x00000000,     0x00191919,     "blendweight"   ,   FALSE,  TRUE  },
-       {blendindices_code,      NULL,       0x00000000,     0x00000000,     "blendindices"  ,   FALSE,  FALSE },
+       {blendindices_code,      NULL,       0x00000000,     0x00333333,     "blendindices"  ,   FALSE,  TRUE  },
        {normal_code,            NULL,       0x00000000,     0x004c4c4c,     "normal"        ,   FALSE,  TRUE  },
        /* Why does dx not forward the texcoord? */
        {texcoord0_code,         NULL,       0x00000000,     0x00808c8c,     "texcoord0"     ,   FALSE,  FALSE },
@@ -6526,7 +6526,9 @@ static void pretransformed_varying_test(IDirect3DDevice9 *device)
          * Needs a replacement pipeline. */
         color = getPixelColor(device, 360, 240);
         if (tests[i].todo_rhw)
-            todo_wine ok(color_match(color, tests[i].color_rhw, 1),
+            todo_wine ok(color_match(color, tests[i].color_rhw, 1)
+                    || broken(color_match(color, 0x00000000, 1)
+                    && tests[i].shader_code == blendindices_code),
                     "Test %s returned color 0x%08x, expected 0x%08x (todo).\n",
                     tests[i].name, color, tests[i].color_rhw);
         else
-- 
1.7.10.4




More information about the wine-patches mailing list