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

d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_UnlockBox(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2016-02-25 19:48:39 +01:00 committed by Alexandre Julliard
parent 9c280ddc84
commit 6f98e85783
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/d3d9/texture.c
View File

@ -1160,20 +1160,16 @@ static HRESULT WINAPI d3d9_texture_3d_LockBox(IDirect3DVolumeTexture9 *iface,
static HRESULT WINAPI d3d9_texture_3d_UnlockBox(IDirect3DVolumeTexture9 *iface, UINT level) static HRESULT WINAPI d3d9_texture_3d_UnlockBox(IDirect3DVolumeTexture9 *iface, UINT level)
{ {
struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface);
struct wined3d_resource *sub_resource;
struct d3d9_volume *volume_impl; struct d3d9_volume *volume_impl;
HRESULT hr; HRESULT hr;
TRACE("iface %p, level %u.\n", iface, level); TRACE("iface %p, level %u.\n", iface, level);
wined3d_mutex_lock(); wined3d_mutex_lock();
if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) if (!(volume_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level)))
hr = D3DERR_INVALIDCALL; hr = D3DERR_INVALIDCALL;
else else
{
volume_impl = wined3d_resource_get_parent(sub_resource);
hr = IDirect3DVolume9_UnlockBox(&volume_impl->IDirect3DVolume9_iface); hr = IDirect3DVolume9_UnlockBox(&volume_impl->IDirect3DVolume9_iface);
}
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return hr; return hr;