mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 06:20:56 +00:00
ddraw: Move the DDSD_CAPS fixup from CreateSurface() to ddraw_surface_create_texture().
This commit is contained in:
parent
06f393dc7d
commit
2c109d2df1
|
@ -2836,12 +2836,6 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD,
|
|||
return E_POINTER; /* unchecked */
|
||||
}
|
||||
|
||||
if (!(DDSD->dwFlags & DDSD_CAPS))
|
||||
{
|
||||
/* DVIDEO.DLL does forget the DDSD_CAPS flag ... *sigh* */
|
||||
DDSD->dwFlags |= DDSD_CAPS;
|
||||
}
|
||||
|
||||
/* Modify some flags */
|
||||
copy_to_surfacedesc2(&desc2, DDSD);
|
||||
|
||||
|
|
|
@ -5608,6 +5608,9 @@ HRESULT ddraw_surface_create_texture(struct ddraw *ddraw, DDSURFACEDESC2 *desc,
|
|||
DDRAW_dump_surface_desc(desc);
|
||||
}
|
||||
|
||||
/* Ensure DDSD_CAPS is always set. */
|
||||
desc->dwFlags |= DDSD_CAPS;
|
||||
|
||||
/* If the surface is of the 'ALLOCONLOAD' type, ignore the LPSURFACE
|
||||
* field. Frank Herbert's Dune specifies a NULL pointer for lpSurface. */
|
||||
if ((desc->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) || !desc->lpSurface)
|
||||
|
|
Loading…
Reference in a new issue