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

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

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
---
 dlls/d3d9/device.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index bac44b6..bd94712 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1281,23 +1281,20 @@ static HRESULT WINAPI \
d3d9_device_GetRenderTargetData(IDirect3DDevice9Ex *iface,  {
     struct d3d9_surface *rt_impl = \
                unsafe_impl_from_IDirect3DSurface9(render_target);
     struct d3d9_surface *dst_impl = unsafe_impl_from_IDirect3DSurface9(dst_surface);
-    struct wined3d_resource_desc wined3d_desc;
-    struct wined3d_resource *sub_resource;
+    struct wined3d_sub_resource_desc wined3d_desc;
     RECT dst_rect, src_rect;
     HRESULT hr;
 
     TRACE("iface %p, render_target %p, dst_surface %p.\n", iface, render_target, \
dst_surface);  
     wined3d_mutex_lock();
-    sub_resource = wined3d_texture_get_sub_resource(dst_impl->wined3d_texture, \
                dst_impl->sub_resource_idx);
-    wined3d_resource_get_desc(sub_resource, &wined3d_desc);
+    wined3d_texture_get_sub_resource_desc(dst_impl->wined3d_texture, \
dst_impl->sub_resource_idx, &wined3d_desc);  dst_rect.left = 0;
     dst_rect.top = 0;
     dst_rect.right = wined3d_desc.width;
     dst_rect.bottom = wined3d_desc.height;
 
-    sub_resource = wined3d_texture_get_sub_resource(rt_impl->wined3d_texture, \
                rt_impl->sub_resource_idx);
-    wined3d_resource_get_desc(sub_resource, &wined3d_desc);
+    wined3d_texture_get_sub_resource_desc(rt_impl->wined3d_texture, \
rt_impl->sub_resource_idx, &wined3d_desc);  src_rect.left = 0;
     src_rect.top = 0;
     src_rect.right = wined3d_desc.width;
-- 
2.1.4


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