[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-patches
Subject:    [PATCH 3/8] d3d8: Use wined3d_texture_get_sub_resource_desc() in d3d8_volume_GetDesc().
From:       Henri Verbeet <hverbeet () codeweavers ! com>
Date:       2016-02-29 17:19:25
Message-ID: 1456766370-17848-3-git-send-email-hverbeet () codeweavers ! com
[Download RAW message or body]

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
---
 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;
-- 
2.1.4


[prev in list] [next in list] [prev in thread] [next in thread]