wined3d: Fix the block alignment check in surface_cpu_blt().

d26a3858 · Henri Verbeet · Alexandre Julliard · 1e22e3cc · d26a3858
Commit d26a3858 authored Jul 11, 2012 by Henri Verbeet Committed by Alexandre Julliard Jul 11, 2012
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

surface.c dlls/wined3d/surface.c +9 -2

No files found.
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -6699,9 +6699,16 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT *
            goto release;
        }

-        if (srcwidth & (src_format->block_width - 1) || srcheight & (src_format->block_height - 1))
+        if (!surface_check_block_align(src_surface, src_rect))
        {
-            WARN("Rectangle not block-aligned.\n");
+            WARN("Source rectangle not block-aligned.\n");
+            hr = WINED3DERR_INVALIDCALL;
+            goto release;
+        }
+
+        if (!surface_check_block_align(dst_surface, dst_rect))
+        {
+            WARN("Destination rectangle not block-aligned.\n");
            hr = WINED3DERR_INVALIDCALL;
            goto release;
        }