Connor McAdams : d3dx9: Only do direct copies of full blocks for compressed formats.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e6f79a8059400cd92ec58cee03d6b89865a056ff
URL:    https://gitlab.winehq.org/wine/wine/-/commit/e6f79a8059400cd92ec58cee03d6b89...

Author: Connor McAdams <cmcadams(a)codeweavers.com>
Date:   Thu Apr 25 12:22:00 2024 -0400

d3dx9: Only do direct copies of full blocks for compressed formats.

Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com>

---

 dlls/d3dx9_36/surface.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index bbeba9c8b23..c3d341e216d 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -1969,8 +1969,8 @@ static HRESULT d3dx_load_image_from_memory(void *dst_memory, uint32_t dst_row_pi
 
     /* Everything matches, simply copy the pixels. */
     if (src_desc->format == dst_desc->format
-            && dst_size.width == src_size.width
-            && dst_size.height == src_size.height
+            && (dst_size.width == src_size.width && !(dst_size.width % dst_desc->block_width))
+            && (dst_size.height == src_size.height && !(dst_size.height % dst_desc->block_height))
             && color_key == 0
             && !(src_rect->left & (src_desc->block_width - 1))
             && !(src_rect->top & (src_desc->block_height - 1))