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

This fixes a regression introduced by commit 7d45318a. Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ddraw: Use the correct height when calculating the linear size in ddraw_surface_init().
1b106fe8 · Henri Verbeet · Alexandre Julliard · c98f40e2 · 1b106fe8
Commit 1b106fe8 authored Feb 09, 2016 by Henri Verbeet Committed by Alexandre Julliard Feb 10, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

surface.c dlls/ddraw/surface.c +6 -1

No files found.
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -6292,10 +6292,15 @@ void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw,

    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)
            desc->u1.dwLinearSize = ~0u;
        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_LPSURFACE | DDSD_PITCH);
    }