[PATCH 2/5] d3dx9: Relax a block alignment check.

Matteo Bruni mbruni at codeweavers.com
Tue Sep 24 12:46:26 CDT 2019


Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
 dlls/d3dx9_36/surface.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index 00a7694ab0b..39dfbf16ac6 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -1905,11 +1905,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
             && color_key == 0) /* Simple copy. */
     {
         if (src_rect->left & (srcformatdesc->block_width - 1)
-                || src_rect->top & (srcformatdesc->block_height - 1)
-                || (src_rect->right & (srcformatdesc->block_width - 1)
-                    && src_size.width != surfdesc.Width)
-                || (src_rect->bottom & (srcformatdesc->block_height - 1)
-                    && src_size.height != surfdesc.Height))
+                || src_rect->top & (srcformatdesc->block_height - 1))
         {
             WARN("Source rect %s is misaligned.\n", wine_dbgstr_rect(src_rect));
             unlock_surface(dst_surface, dst_rect, surface, FALSE);
-- 
2.21.0




More information about the wine-devel mailing list