Henri Verbeet : wined3d: Avoid surface_from_resource() in wined3d_texture_update_desc().

Alexandre Julliard julliard at wine.codeweavers.com
Thu Mar 3 11:39:43 CST 2016


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Mar  2 19:24:14 2016 +0100

wined3d: Avoid surface_from_resource() in wined3d_texture_update_desc().

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/texture.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index a664155..651318c 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -631,7 +631,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT
         return WINED3DERR_INVALIDCALL;
     }
 
-    surface = surface_from_resource(texture->sub_resources[0].resource);
+    surface = texture->sub_resources[0].u.surface;
     if (surface->resource.map_count || (surface->flags & SFLAG_DCINUSE))
     {
         WARN("Surface is mapped or the DC is in use.\n");




More information about the wine-cvs mailing list