reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-24 20:30:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d3dx9: Introduce a special case for simple loads in D3DXLoadSurfaceFromMemory().

Browse Source
This commit is contained in:
Henri Verbeet 2012-04-26 21:11:54 +02:00 committed by Alexandre Julliard
parent c638aab2b4
commit e925553072
1 changed files with 58 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
dlls/d3dx9_36/surface.c
View File

@ -957,11 +957,6 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface,
IDirect3DSurface9_GetDesc(pDestSurface, &surfdesc); IDirect3DSurface9_GetDesc(pDestSurface, &surfdesc);
srcformatdesc = get_format_info(SrcFormat);
destformatdesc = get_format_info(surfdesc.Format);
if( srcformatdesc->type == FORMAT_UNKNOWN || srcformatdesc->bytes_per_pixel > 4) return E_NOTIMPL;
if(destformatdesc->type == FORMAT_UNKNOWN || destformatdesc->bytes_per_pixel > 4) return E_NOTIMPL;
srcsize.x = pSrcRect->right - pSrcRect->left; srcsize.x = pSrcRect->right - pSrcRect->left;
srcsize.y = pSrcRect->bottom - pSrcRect->top; srcsize.y = pSrcRect->bottom - pSrcRect->top;
if( !pDestRect ) { if( !pDestRect ) {
@ -976,21 +971,67 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface,
if(destsize.x == 0 || destsize.y == 0) return D3D_OK; if(destsize.x == 0 || destsize.y == 0) return D3D_OK;
} }
hr = IDirect3DSurface9_LockRect(pDestSurface, &lockrect, pDestRect, 0); srcformatdesc = get_format_info(SrcFormat);
if(FAILED(hr)) return D3DXERR_INVALIDDATA; if (srcformatdesc->type == FORMAT_UNKNOWN)
return E_NOTIMPL;
if((dwFilter & 0xF) == D3DX_FILTER_NONE) { destformatdesc = get_format_info(surfdesc.Format);
copy_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc, if (destformatdesc->type == FORMAT_UNKNOWN)
lockrect.pBits, lockrect.Pitch, destsize, destformatdesc, return E_NOTIMPL;
Colorkey);
} else /*if((dwFilter & 0xF) == D3DX_FILTER_POINT) */ { if (SrcFormat == surfdesc.Format
/* always apply a point filter until D3DX_FILTER_LINEAR, D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented */ && destsize.x == srcsize.x
point_filter_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc, && destsize.y == srcsize.y) /* Simple copy. */
lockrect.pBits, lockrect.Pitch, destsize, destformatdesc, {
Colorkey); const BYTE *src_addr;
BYTE *dst_addr;
UINT y;
if (FAILED(hr = IDirect3DSurface9_LockRect(pDestSurface, &lockrect, pDestRect, 0)))
return D3DXERR_INVALIDDATA;
src_addr = pSrcMemory;
src_addr += pSrcRect->top * SrcPitch;
src_addr += pSrcRect->left * srcformatdesc->bytes_per_pixel;
dst_addr = lockrect.pBits;
for (y = 0; y < srcsize.y; ++y)
{
memcpy(dst_addr, src_addr, srcsize.x * srcformatdesc->bytes_per_pixel);
src_addr += SrcPitch;
dst_addr += lockrect.Pitch;
}
IDirect3DSurface9_UnlockRect(pDestSurface);
}
else /* Stretching or format conversion. */
{
if (srcformatdesc->bytes_per_pixel > 4)
return E_NOTIMPL;
if (destformatdesc->bytes_per_pixel > 4)
return E_NOTIMPL;
if (FAILED(hr = IDirect3DSurface9_LockRect(pDestSurface, &lockrect, pDestRect, 0)))
return D3DXERR_INVALIDDATA;
if ((dwFilter & 0xf) == D3DX_FILTER_NONE)
{
copy_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc,
lockrect.pBits, lockrect.Pitch, destsize, destformatdesc,
Colorkey);
}
else /* if ((dwFilter & 0xf) == D3DX_FILTER_POINT) */
{
/* Always apply a point filter until D3DX_FILTER_LINEAR,
* D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */
point_filter_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc,
lockrect.pBits, lockrect.Pitch, destsize, destformatdesc,
Colorkey);
}
IDirect3DSurface9_UnlockRect(pDestSurface);
} }
IDirect3DSurface9_UnlockRect(pDestSurface);
return D3D_OK; return D3D_OK;
} }