Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_volume_GetDesc().
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Mar 1 10:44:05 CST 2016
Module: wine
Branch: master
Commit: f2fdb1685665c20f98f18428c3bc3096ad4126c0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2fdb1685665c20f98f18428c3bc3096ad4126c0
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Feb 29 18:19:25 2016 +0100
d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_volume_GetDesc().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d8/volume.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c
index f26e424..f3a30a8 100644
--- a/dlls/d3d8/volume.c
+++ b/dlls/d3d8/volume.c
@@ -115,18 +115,16 @@ static HRESULT WINAPI d3d8_volume_GetContainer(IDirect3DVolume8 *iface, REFIID r
static HRESULT WINAPI d3d8_volume_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DESC *desc)
{
struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface);
- struct wined3d_resource_desc wined3d_desc;
- struct wined3d_resource *sub_resource;
+ struct wined3d_sub_resource_desc wined3d_desc;
TRACE("iface %p, desc %p.\n", iface, desc);
wined3d_mutex_lock();
- sub_resource = wined3d_texture_get_sub_resource(volume->wined3d_texture, volume->sub_resource_idx);
- wined3d_resource_get_desc(sub_resource, &wined3d_desc);
+ wined3d_texture_get_sub_resource_desc(volume->wined3d_texture, volume->sub_resource_idx, &wined3d_desc);
wined3d_mutex_unlock();
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->Size = wined3d_desc.size;
More information about the wine-cvs
mailing list