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

[Alexandre Julliard]

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

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

wined3d: Use wined3d_texture_load_location() in surface_blt_fbo().

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

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 8ae4b73..68a6f7d 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -502,6 +502,7 @@ static void surface_blt_fbo(const struct wined3d_device *device,
         struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect_in)
 {
     unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface);
+    unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface);
     struct wined3d_texture *dst_texture = dst_surface->container;
     struct wined3d_texture *src_texture = src_surface->container;
     const struct wined3d_gl_info *gl_info;
@@ -545,9 +546,9 @@ static void surface_blt_fbo(const struct wined3d_device *device,
      * surface isn't required if the entire surface is overwritten. (And is
      * in fact harmful if we're being called by surface_load_location() with
      * the purpose of loading the destination surface.) */
-    surface_load_location(src_surface, old_ctx, src_location);
+    wined3d_texture_load_location(src_texture, src_sub_resource_idx, old_ctx, src_location);
     if (!surface_is_full_rect(dst_surface, &dst_rect))
-        surface_load_location(dst_surface, old_ctx, dst_location);
+        wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, old_ctx, dst_location);
     else
         wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, old_ctx, dst_location);