Henri Verbeet : d3d9/tests: Handle the Windows 8 testbot results in zenable_test().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f174ca74c88ddc4fc48e1047cd334a8ed9b69a9c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f174ca74c88ddc4fc48e1047cd334a8ed9b69a9c

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Apr  1 09:50:44 2014 +0200

d3d9/tests: Handle the Windows 8 testbot results in zenable_test().

---

 dlls/d3d9/tests/visual.c |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 6f3fef3..7e852b4 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -15053,6 +15053,15 @@ static void zenable_test(void)
             0x00ff0000, 0x00606060, 0x009f609f, 0x00ff0000,
             0x00ff0000, 0x00602060, 0x009f209f, 0x00ff0000,
         };
+        /* The Windows 8 testbot (WARP) appears to not clip z for regular
+         * vertices either. */
+        static const D3DCOLOR expected_broken[] =
+        {
+            0x0020df20, 0x0060df60, 0x009fdf9f, 0x00dfdfdf,
+            0x00209f20, 0x00609f60, 0x009f9f9f, 0x00df9fdf,
+            0x00206020, 0x00606060, 0x009f609f, 0x00df60df,
+            0x00202020, 0x00602060, 0x009f209f, 0x00df20df,
+        };
 
         IDirect3DVertexShader9 *vs;
         IDirect3DPixelShader9 *ps;
@@ -15084,7 +15093,8 @@ static void zenable_test(void)
                 x = 80 * ((2 * j) + 1);
                 y = 60 * ((2 * i) + 1);
                 color = getPixelColor(device, x, y);
-                ok(color_match(color, expected[i * 4 + j], 1),
+                ok(color_match(color, expected[i * 4 + j], 1)
+                        || broken(color_match(color, expected_broken[i * 4 + j], 1)),
                         "Expected color 0x%08x at %u, %u, got 0x%08x.\n", expected[i * 4 + j], x, y, color);
             }
         }
@@ -15092,10 +15102,6 @@ static void zenable_test(void)
         hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);
         ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr);
 
-        hr = IDirect3DDevice9_SetPixelShader(device, NULL);
-        ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr);
-        hr = IDirect3DDevice9_SetVertexShader(device, NULL);
-        ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr);
         IDirect3DPixelShader9_Release(ps);
         IDirect3DVertexShader9_Release(vs);
     }