ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Use the correct height when calculating the linear size in ddraw_surface_init(). 

This fixes a regression introduced by commit
7d45318aea.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2016-02-09 21:29:55 +01:00 committed by Alexandre Julliard
parent c98f40e227
commit 1b106fe830
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/ddraw/surface.c
View File

@ -6292,10 +6292,15 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw,
if (format_is_compressed(&desc->u4.ddpfPixelFormat)) if (format_is_compressed(&desc->u4.ddpfPixelFormat))
{ {
unsigned int texture_level, row_pitch;
texture_level = desc->ddsCaps.dwCaps & DDSCAPS_MIPMAP ? sub_resource_idx % desc->u2.dwMipMapCount : 0;
row_pitch = wined3d_surface_get_pitch(wined3d_surface);
if (desc->dwFlags & DDSD_LPSURFACE) if (desc->dwFlags & DDSD_LPSURFACE)
desc->u1.dwLinearSize = ~0u; desc->u1.dwLinearSize = ~0u;
else else
desc->u1.dwLinearSize = wined3d_surface_get_pitch(wined3d_surface) * ((desc->dwHeight + 3) / 4); desc->u1.dwLinearSize = row_pitch * ((max(1, desc->dwHeight >> texture_level) + 3) / 4);
desc->dwFlags |= DDSD_LINEARSIZE; desc->dwFlags |= DDSD_LINEARSIZE;
desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_PITCH); desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_PITCH);
} }