ddraw: Don't overwrite the caller specified pitch in ddraw_surface_init().

This commit is contained in:
Henri Verbeet 2014-03-04 10:21:36 +01:00 committed by Alexandre Julliard
parent 162bc8db6e
commit 10db40cecc
1 changed files with 3 additions and 3 deletions

View File

@ -6059,10 +6059,10 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s
else
surface->surface_desc.u1.dwLinearSize = max(4, desc->dwWidth) * max(4, desc->dwHeight);
}
else
else if (!(desc->dwFlags & DDSD_LPSURFACE))
{
surface->surface_desc.dwFlags |= DDSD_PITCH;
surface->surface_desc.u1.lPitch = wined3d_surface_get_pitch(wined3d_surface);
desc->dwFlags |= DDSD_PITCH;
desc->u1.lPitch = wined3d_surface_get_pitch(wined3d_surface);
}
if (desc->dwFlags & DDSD_LPSURFACE)