Module: wine Branch: master Commit: e580d74829b9e01cbcf4349ef4e5cc50d73b6e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e580d74829b9e01cbcf4349ef4... Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 17:30:00 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_texture_3d_UnlockBox(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 2b9df09..b9f5824 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1029,20 +1029,16 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface, static HRESULT WINAPI d3d8_texture_3d_UnlockBox(IDirect3DVolumeTexture8 *iface, UINT level) { struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); - struct wined3d_resource *sub_resource; struct d3d8_volume *volume_impl; HRESULT hr; TRACE("iface %p, level %u.\n", iface, level); 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; else - { - volume_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DVolume8_UnlockBox(&volume_impl->IDirect3DVolume8_iface); - } wined3d_mutex_unlock(); return hr;