From: Stefan Dösinger Subject: [PATCH 3/6] d3d9: Forward Volume::GetDesc to VolumeTexture::GetLevelDesc. Message-Id: <1397742453-22083-3-git-send-email-stefan@codeweavers.com> Date: Thu, 17 Apr 2014 15:47:30 +0200 --- dlls/d3d9/volume.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 35e96df..5213c4a 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -167,25 +167,11 @@ static HRESULT WINAPI d3d9_volume_GetContainer(IDirect3DVolume9 *iface, REFIID r static HRESULT WINAPI d3d9_volume_GetDesc(IDirect3DVolume9 *iface, D3DVOLUME_DESC *desc) { struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface); - struct wined3d_resource_desc wined3d_desc; - struct wined3d_resource *wined3d_resource; TRACE("iface %p, desc %p.\n", iface, desc); - wined3d_mutex_lock(); - wined3d_resource = wined3d_volume_get_resource(volume->wined3d_volume); - wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); - wined3d_mutex_unlock(); - - desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; - desc->Pool = wined3d_desc.pool; - desc->Width = wined3d_desc.width; - desc->Height = wined3d_desc.height; - desc->Depth = wined3d_desc.depth; - - return D3D_OK; + return IDirect3DVolumeTexture9_GetLevelDesc((IDirect3DVolumeTexture9 *)volume->container, + volume->level, desc); } static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface, -- 1.8.3.2