=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: wined3d: Use wined3d_texture_prepare_location() in wined3d_texture_update_desc().

[Alexandre Julliard]

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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Tue May 17 14:01:55 2016 +0200

wined3d: Use wined3d_texture_prepare_location() 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/surface.c         | 8 --------
 dlls/wined3d/texture.c         | 2 +-
 dlls/wined3d/wined3d_private.h | 2 --
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index e0d7c80..4fb2251 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -4303,11 +4303,3 @@ cpu:
     return surface_cpu_blt(dst_texture, dst_sub_resource_idx, &dst_box,
             src_texture, src_sub_resource_idx, &src_box, flags, fx, filter);
 }
-
-/* Context activation is done by the caller. Context may be NULL in
- * WINED3D_NO3D mode. */
-void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location)
-{
-    wined3d_texture_prepare_location(surface->container,
-            surface_get_sub_resource_idx(surface), context, location);
-}
diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
index 53dbb2f..e0bb82f 100644
--- a/dlls/wined3d/texture.c
+++ b/dlls/wined3d/texture.c
@@ -1051,7 +1051,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT
     }
     else
     {
-        wined3d_surface_prepare(surface, NULL, WINED3D_LOCATION_SYSMEM);
+        wined3d_texture_prepare_location(texture, 0, NULL, WINED3D_LOCATION_SYSMEM);
         valid_location = WINED3D_LOCATION_SYSMEM;
     }
 
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index c2f6471..bf43d75 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2713,8 +2713,6 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb,
 HRESULT surface_load_location(struct wined3d_surface *surface,
         struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN;
 void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN;
-void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context,
-        DWORD location) DECLSPEC_HIDDEN;
 void surface_set_compatible_renderbuffer(struct wined3d_surface *surface,
         const struct wined3d_surface *rt) DECLSPEC_HIDDEN;
 void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN;