31 Oct
2024
31 Oct
'24
5:41 p.m.
Matteo Bruni (@Mystral) commented about dlls/d3dx9_36/surface.c:
if (FAILED(hr)) goto exit;
- hr = D3DXLoadSurfaceFromMemory(pDestSurface, pDestPalette, pDestRect, pixels.data, img_info.Format, - pixels.row_pitch, pixels.palette, &src_rect, dwFilter, Colorkey); + hr = D3DXLoadSurfaceFromMemory(pDestSurface, pDestPalette, pDestRect, pixels.data, + d3dformat_from_d3dx_pixel_format_id(image.format), pixels.row_pitch, pixels.palette, &src_rect, dwFilter, + Colorkey);
I guess we don't need this hunk since it looks like we're going to keep `img_info` around. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6746#note_86402