Riccardo Bortolato : d3d9: Don' t use a wined3d_surface in d3d9_surface_GetDesc.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9b02e116bdc4a9a9e5a47faca75a4483952923eb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9b02e116bdc4a9a9e5a47faca7...

Author: Riccardo Bortolato 
Date:   Mon Oct 12 12:44:12 2015 +0200

d3d9: Don't use a wined3d_surface in d3d9_surface_GetDesc.

Signed-off-by: Riccardo Bortolato 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/d3d9/surface.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index 83c90ab..ed00f7a 100644
--- a/dlls/d3d9/surface.c
+++ b/dlls/d3d9/surface.c
@@ -208,13 +208,13 @@ static HRESULT WINAPI d3d9_surface_GetDesc(IDirect3DSurface9 *iface, D3DSURFACE_
 {
     struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface);
     struct wined3d_resource_desc wined3d_desc;
-    struct wined3d_resource *wined3d_resource;
+    struct wined3d_resource *sub_resource;

TRACE("iface %p, desc %p.\n", iface, desc);

wined3d_mutex_lock();
-    wined3d_resource = wined3d_surface_get_resource(surface->wined3d_surface);
-    wined3d_resource_get_desc(wined3d_resource, &wined3d_desc);
+    sub_resource = wined3d_texture_get_sub_resource(surface->wined3d_texture, surface->sub_resource_idx);
+    wined3d_resource_get_desc(sub_resource, &wined3d_desc);
     wined3d_mutex_unlock();

desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);