=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: ddraw/tests: Mark a strange radeon X1600 Windows behavior broken.

Alexandre Julliard julliard at winehq.org
Mon Sep 19 13:48:45 CDT 2011


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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Thu Sep 15 23:49:21 2011 +0200

ddraw/tests: Mark a strange radeon X1600 Windows behavior broken.

---

 dlls/ddraw/tests/d3d.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
index dee6f05..54ff598 100644
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -4401,8 +4401,12 @@ static HRESULT WINAPI enum_z_fmt_cb(DDPIXELFORMAT *fmt, void *ctx)
     if (U1(*fmt).dwZBufferBitDepth == 24) expected_pitch = ddsd.dwWidth * 4;
     else expected_pitch = ddsd.dwWidth * U1(*fmt).dwZBufferBitDepth / 8;
 
-    /* Some formats(16 bit depth without stencil) return pitch 0 */
-    if (U1(ddsd).lPitch != 0 && U1(ddsd).lPitch != expected_pitch)
+    /* Some formats(16 bit depth without stencil) return pitch 0
+     *
+     * The Radeon X1600 Catalyst 10.2 Windows XP driver returns an otherwise sane
+     * pitch with an extra 128 bytes, regardless of the format and width */
+    if (U1(ddsd).lPitch != 0 && U1(ddsd).lPitch != expected_pitch
+            && !broken(U1(ddsd).lPitch == expected_pitch + 128))
     {
         ok(0, "Z buffer pitch is %u, expected %u\n", U1(ddsd).lPitch, expected_pitch);
         dump_format(fmt);




More information about the wine-cvs mailing list