From: Stefan Dösinger Subject: [PATCH 1/6] d3d9: Retrieve the volume description from the container. Message-Id: <1397742453-22083-1-git-send-email-stefan@codeweavers.com> Date: Thu, 17 Apr 2014 15:47:28 +0200 --- dlls/d3d9/texture.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 3c2107a..fc15b80 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1073,26 +1073,32 @@ static void WINAPI d3d9_texture_3d_GenerateMipSubLevels(IDirect3DVolumeTexture9 static HRESULT WINAPI d3d9_texture_3d_GetLevelDesc(IDirect3DVolumeTexture9 *iface, UINT level, D3DVOLUME_DESC *desc) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *sub_resource; HRESULT hr = D3D_OK; + DWORD level_count; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + level_count = wined3d_texture_get_level_count(texture->wined3d_texture); + if (level >= level_count) + { + WARN("Invalid mipmap level specified, returning D3DERR_INVALIDCALL.\n"); hr = D3DERR_INVALIDCALL; + } else { + struct wined3d_resource *resource = wined3d_texture_get_resource(texture->wined3d_texture); struct wined3d_resource_desc wined3d_desc; - wined3d_resource_get_desc(sub_resource, &wined3d_desc); + wined3d_resource_get_desc(resource, &wined3d_desc); desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); - desc->Type = wined3d_desc.resource_type; + desc->Type = D3DRTYPE_VOLUME; 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; + desc->Width = max(wined3d_desc.width >> level, 1); + desc->Height = max(wined3d_desc.height >> level, 1); + desc->Depth = max(wined3d_desc.depth >> level, 1); + hr = D3D_OK; } wined3d_mutex_unlock(); -- 1.8.3.2