From 399825cd8e781723e30a5b0293e37f7872dabc37 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com>
Date: Sat, 2 Aug 2008 18:06:01 -0500
Subject: [PATCH] wined3d: Report the pitch alignment to ddraw.

---
 dlls/wined3d/directx.c         | 6 +++---
 dlls/wined3d/wined3d_private.h | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index ddb71021c49..9101ba86a97 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -3483,7 +3483,7 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter,
                                         WINEDDSCAPS_SYSTEMMEMORY            |
                                         WINEDDSCAPS_VIDEOMEMORY             |
                                         WINEDDSCAPS_VISIBLE;
-    pCaps->DirectDrawCaps.StrideAlign = 0; /* TODO: SURFACE_ALIGNMENT */
+    pCaps->DirectDrawCaps.StrideAlign = DDRAW_PITCH_ALIGNMENT;
 
     /* Set D3D caps if OpenGL is available. */
     if(Adapters[Adapter].opengl) {
@@ -3535,9 +3535,9 @@ static HRESULT  WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter,
     list_init(&object->shaders);
 
     if(This->dxVersion == 7) {
-        object->surface_alignment = 8;
+        object->surface_alignment = DDRAW_PITCH_ALIGNMENT;
     } else {
-        object->surface_alignment = 4;
+        object->surface_alignment = D3D8_PITCH_ALIGNMENT;
     }
     object->posFixup[0] = 1.0; /* This is needed to get the x coord unmodified through a MAD */
 
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 453c92a2cf1..0e798c1b010 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -835,6 +835,8 @@ struct IWineD3DDeviceImpl
     BOOL                    view_ident;        /* true iff view matrix is identity                */
     BOOL                    untransformed;
     BOOL                    vertexBlendUsed;   /* To avoid needless setting of the blend matrices */
+#define DDRAW_PITCH_ALIGNMENT 8
+#define D3D8_PITCH_ALIGNMENT 4
     unsigned char           surface_alignment; /* Line Alignment of surfaces                      */
 
     /* State block related */
-- 
2.11.4.GIT