system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-06 10:39:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3dx9: Factor our check_texture_requirements() function.

Browse source 
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Paul Gofman 2019-10-28 09:27:40 +03:00 committed by Alexandre Julliard
parent fcdcd5d3cb
commit 92c8c0fc7f
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
dlls/d3dx9_36/texture.c
View file

@ -210,8 +210,8 @@ static D3DFORMAT get_replacement_format(D3DFORMAT format)
return format;
}
HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height,
UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool)
static HRESULT check_texture_requirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height,
UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool, D3DRESOURCETYPE resource_type)
{
UINT w = (width && *width) ? *width : 1;
UINT h = (height && *height) ? *height : 1;
@ -223,8 +223,6 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN
D3DFORMAT usedformat = D3DFMT_UNKNOWN;
const struct pixel_format_desc *fmt;
TRACE("(%p, %p, %p, %p, %u, %p, %u)\n", device, width, height, miplevels, usage, format, pool);
if (!device)
return D3DERR_INVALIDCALL;
@ -266,7 +264,7 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN
fmt = get_format_info(usedformat);
hr = IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType, mode.Format,
usage, D3DRTYPE_TEXTURE, usedformat);
usage, resource_type, usedformat);
if (FAILED(hr))
{
BOOL allow_24bits;
@ -301,7 +299,7 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN
continue;
hr = IDirect3D9_CheckDeviceFormat(d3d, params.AdapterOrdinal, params.DeviceType,
mode.Format, usage, D3DRTYPE_TEXTURE, curfmt->format);
mode.Format, usage, resource_type, curfmt->format);
if (FAILED(hr))
continue;
@ -422,6 +420,15 @@ cleanup:
return D3D_OK;
}
HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UINT *width, UINT *height,
UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool)
{
TRACE("device %p, width %p, height %p, miplevels %p, usage %u, format %p, pool %u.\n",
device, width, height, miplevels, usage, format, pool);
return check_texture_requirements(device, width, height, miplevels, usage, format, pool, D3DRTYPE_TEXTURE);
}
HRESULT WINAPI D3DXCheckCubeTextureRequirements(struct IDirect3DDevice9 *device, UINT *size,
UINT *miplevels, DWORD usage, D3DFORMAT *format, D3DPOOL pool)
{