commit d26a3858d918520c58b5d1e597dabe428a58898a
author Henri Verbeet <hverbeet@codeweavers.com> Wed Jul 11 12:19:02 2012 +0200
committer Alexandre Julliard <julliard@winehq.org> Wed Jul 11 09:56:58 2012 -0500
tree aa42a5bb672917edea94b3794192db99ea7a2c27
parent 1e22e3ccfbabc0b71ae71517fa8633d3e412ebf6

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

dlls/wined3d/surface.c

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 91ebcca..ea0baa4 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -6699,9 +6699,16 @@
             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;
         }