d3d9: Don't use a wined3d_surface in d3d9_surface_GetDesc.

Signed-off-by: Riccardo Bortolato <rikyz619@gmail.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3d9: Don't use a wined3d_surface in d3d9_surface_GetDesc.
9b02e116 · Riccardo Bortolato · Alexandre Julliard · 736ca38d · 9b02e116
Commit 9b02e116 authored Oct 12, 2015 by Riccardo Bortolato Committed by Alexandre Julliard Oct 12, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

surface.c dlls/d3d9/surface.c +3 -3

No files found.
--- 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);