H. Verbeet : d3d9: Disable the surface pitch size test for now, just check alignment instead.

[Alexandre Julliard]

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

Author: H. Verbeet <hverbeet(a)gmail.com>
Date:   Tue Oct 10 19:53:42 2006 +0200

d3d9: Disable the surface pitch size test for now, just check alignment instead.

---

 dlls/d3d9/tests/surface.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c
index 95e7311..b7a16a2 100644
--- a/dlls/d3d9/tests/surface.c
+++ b/dlls/d3d9/tests/surface.c
@@ -127,8 +127,13 @@ static void test_surface_alignment(IDire
         D3DLOCKED_RECT lockedRect;
         hr = IDirect3DSurface9_LockRect(surface_ptr, &lockedRect, NULL, 0);
         ok(hr == D3D_OK, "IDirect3DSurface9_LockRect returned %08x\n", hr);
-        /* test is deactivated until out np2 support doesn't report the full power of 2 pitch to the app */
-        todo_wine ok(lockedRect.Pitch == 12, "Got pitch %d, expected 12\n", lockedRect.Pitch);
+        ok(!(lockedRect.Pitch & 3), "Surface pitch %d is not 32-bit aligned\n", lockedRect.Pitch);
+#if 0
+        /* Some applications also depend on the exact pitch, rather than just
+         * the alignment. However, this test will fail or succeed depending
+         * on the NP2 mode we're using. */
+        ok(lockedRect.Pitch == 12, "Got pitch %d, expected 12\n", lockedRect.Pitch);
+#endif
         hr = IDirect3DSurface9_UnlockRect(surface_ptr);
         IDirect3DSurface9_Release(surface_ptr);
     }