Henri Verbeet : wined3d: Use wined3d_texture_load_location() in surface_upload_from_surface().

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Wed Aug  3 15:25:28 2016 +0200

wined3d: Use wined3d_texture_load_location() in surface_upload_from_surface().

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

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 68a6f7d..744912c 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1188,7 +1188,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
     if (update_w == dst_w && update_h == dst_h)
         wined3d_texture_prepare_texture(dst_texture, context, FALSE);
     else
-        surface_load_location(dst_surface, context, WINED3D_LOCATION_TEXTURE_RGB);
+        wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB);
     wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE);

wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data,