ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Fix pitch passed to DXTn [de]compression functions. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47862
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Matteo Bruni 2019-10-02 20:22:08 +02:00 committed by Alexandre Julliard
parent 99719dff1f
commit 9069913dbb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/d3dx9_36/surface.c
View File

@ -1972,6 +1972,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
int i, int j, void *texel); int i, int j, void *texel);
unsigned int x, y; unsigned int x, y;
src_pitch = src_pitch * srcformatdesc->block_width / srcformatdesc->block_byte_count;
src_uncompressed = heap_alloc(src_size.width * src_size.height * sizeof(DWORD)); src_uncompressed = heap_alloc(src_size.width * src_size.height * sizeof(DWORD));
if (!src_uncompressed) if (!src_uncompressed)
{ {
@ -2003,8 +2005,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
DWORD *ptr = &src_uncompressed[y * src_size.width]; DWORD *ptr = &src_uncompressed[y * src_size.width];
for (x = 0; x < src_size.width; ++x) for (x = 0; x < src_size.width; ++x)
{ {
fetch_dxt_texel(src_pitch / sizeof(DWORD), src_memory, fetch_dxt_texel(src_pitch, src_memory, x + src_rect->left, y + src_rect->top, ptr);
x + src_rect->left, y + src_rect->top, ptr);
++ptr; ++ptr;
} }
} }
@ -2080,7 +2081,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
ERR("Unexpected destination compressed format %u.\n", surfdesc.Format); ERR("Unexpected destination compressed format %u.\n", surfdesc.Format);
} }
tx_compress_dxtn(4, dst_size_aligned.width, dst_size_aligned.height, tx_compress_dxtn(4, dst_size_aligned.width, dst_size_aligned.height,
dst_uncompressed, gl_format, lockrect.pBits, lockrect.Pitch); dst_uncompressed, gl_format, lockrect.pBits,
lockrect.Pitch * destformatdesc->block_width / destformatdesc->block_byte_count);
heap_free(dst_uncompressed); heap_free(dst_uncompressed);
} }
} }