[PATCH 6/8] d3d9: Use wined3d_texture_get_sub_resource_desc() in d3d9_texture_cube_GetLevelDesc().
Henri Verbeet
hverbeet at codeweavers.com
Tue Mar 1 12:31:47 CST 2016
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/d3d9/texture.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
index cdb7193..50ef88d 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -675,9 +675,9 @@ static void WINAPI d3d9_texture_cube_GenerateMipSubLevels(IDirect3DCubeTexture9
static HRESULT WINAPI d3d9_texture_cube_GetLevelDesc(IDirect3DCubeTexture9 *iface, UINT level, D3DSURFACE_DESC *desc)
{
struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface);
- struct wined3d_resource *sub_resource;
- HRESULT hr = D3D_OK;
+ struct wined3d_sub_resource_desc wined3d_desc;
DWORD level_count;
+ HRESULT hr;
TRACE("iface %p, level %u, desc %p.\n", iface, level, desc);
@@ -689,15 +689,10 @@ static HRESULT WINAPI d3d9_texture_cube_GetLevelDesc(IDirect3DCubeTexture9 *ifac
return D3DERR_INVALIDCALL;
}
- if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level)))
- hr = D3DERR_INVALIDCALL;
- else
+ if (SUCCEEDED(hr = wined3d_texture_get_sub_resource_desc(texture->wined3d_texture, level, &wined3d_desc)))
{
- struct wined3d_resource_desc wined3d_desc;
-
- wined3d_resource_get_desc(sub_resource, &wined3d_desc);
desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
- desc->Type = wined3d_desc.resource_type;
+ desc->Type = D3DRTYPE_SURFACE;
desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK;
desc->Pool = wined3d_desc.pool;
desc->MultiSampleType = wined3d_desc.multisample_type;
--
2.1.4
More information about the wine-patches
mailing list