marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d8: It's not an error to have a NULL texture bound to a stage.

oldstable
Henri Verbeet 2009-09-25 13:31:47 +02:00 committed by Alexandre Julliard
parent c64da00de7
commit 906071aa9f
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/d3d8/device.c
View File

@ -1471,8 +1471,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetClipStatus(LPDIRECT3DDEVICE8 iface
static HRESULT WINAPI IDirect3DDevice8Impl_GetTexture(LPDIRECT3DDEVICE8 iface, DWORD Stage,IDirect3DBaseTexture8** ppTexture) {
IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
IWineD3DBaseTexture *retTexture = NULL;
HRESULT rc = D3D_OK;
IWineD3DBaseTexture *retTexture;
HRESULT hr;
TRACE("(%p) Relay\n" , This);
@ -1481,17 +1481,27 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetTexture(LPDIRECT3DDEVICE8 iface, D
}
wined3d_mutex_lock();
rc = IWineD3DDevice_GetTexture(This->WineD3DDevice, Stage, &retTexture);
if (rc == D3D_OK && NULL != retTexture) {
hr = IWineD3DDevice_GetTexture(This->WineD3DDevice, Stage, &retTexture);
if (FAILED(hr))
{
WARN("Failed to get texture for stage %u, hr %#x.\n", Stage, hr);
wined3d_mutex_unlock();
*ppTexture = NULL;
return hr;
}
if (retTexture)
{
IWineD3DBaseTexture_GetParent(retTexture, (IUnknown **)ppTexture);
IWineD3DBaseTexture_Release(retTexture);
} else {
FIXME("Call to get texture (%d) failed (%p)\n", Stage, retTexture);
}
else
{
*ppTexture = NULL;
}
wined3d_mutex_unlock();
return rc;
return D3D_OK;
}
static HRESULT WINAPI IDirect3DDevice8Impl_SetTexture(LPDIRECT3DDEVICE8 iface, DWORD Stage, IDirect3DBaseTexture8* pTexture) {