From 9c280ddc841f5e4cb085ea7bfbd2beccabaed410 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Thu, 25 Feb 2016 19:48:38 +0100 Subject: [PATCH] d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_LockBox(). Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/d3d9/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index c096d43b1a8..a47c4396f82 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1141,7 +1141,6 @@ static HRESULT WINAPI d3d9_texture_3d_LockBox(IDirect3DVolumeTexture9 *iface, UINT level, D3DLOCKED_BOX *locked_box, const D3DBOX *box, DWORD flags) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_volume *volume_impl; HRESULT hr; @@ -1149,13 +1148,10 @@ static HRESULT WINAPI d3d9_texture_3d_LockBox(IDirect3DVolumeTexture9 *iface, iface, level, locked_box, box, flags); 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 = IDirect3DVolume9_LockBox(&volume_impl->IDirect3DVolume9_iface, locked_box, box, flags); - } wined3d_mutex_unlock(); return hr; -- 2.11.4.GIT