Matteo Bruni : d3dx9: Relax a block alignment check.
Alexandre Julliard
julliard at winehq.org
Tue Sep 24 16:04:45 CDT 2019
Module: wine
Branch: master
Commit: e371085aaf4424e6ef9b5b76ebf3107121d22f50
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e371085aaf4424e6ef9b5b76ebf3107121d22f50
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Tue Sep 24 19:46:26 2019 +0200
d3dx9: Relax a block alignment check.
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 00a7694ab0..39dfbf16ac 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);
More information about the wine-cvs
mailing list