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

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Aug  3 15:25:30 2016 +0200

wined3d: Use wined3d_texture_load_location() in surface_load_drawable().

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

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index fdc7a51..c3a491f 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2819,6 +2819,7 @@ static void surface_load_sysmem(struct wined3d_surface *surface,
 static HRESULT surface_load_drawable(struct wined3d_surface *surface,
         struct wined3d_context *context)
 {
+    unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface);
     struct wined3d_texture *texture = surface->container;
     RECT r;
 
@@ -2830,7 +2831,7 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface,
     }
 
     surface_get_rect(surface, NULL, &r);
-    surface_load_location(surface, context, WINED3D_LOCATION_TEXTURE_RGB);
+    wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB);
     surface_blt_to_drawable(texture->resource.device, context,
             WINED3D_TEXF_POINT, FALSE, surface, &r, surface, &r);