Henri Verbeet : wined3d: Use the texture dimension helpers in surface_upload_from_surface().

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Tue Apr  5 18:24:21 2016 +0200

wined3d: Use the texture dimension helpers in surface_upload_from_surface().

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

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 0055e62..b6e8f99 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1287,7 +1287,8 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
 
     if (!src_rect)
     {
-        SetRect(&r, 0, 0, src_surface->resource.width, src_surface->resource.height);
+        SetRect(&r, 0, 0, wined3d_texture_get_level_width(src_texture, src_surface->texture_level),
+                wined3d_texture_get_level_height(src_texture, src_surface->texture_level));
         src_rect = &r;
     }
     else if (src_rect->left < 0 || src_rect->left >= src_rect->right
@@ -1297,8 +1298,8 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
         return WINED3DERR_INVALIDCALL;
     }
 
-    dst_w = dst_surface->resource.width;
-    dst_h = dst_surface->resource.height;
+    dst_w = wined3d_texture_get_level_width(dst_texture, dst_surface->texture_level);
+    dst_h = wined3d_texture_get_level_height(dst_texture, dst_surface->texture_level);
 
     update_w = src_rect->right - src_rect->left;
     update_h = src_rect->bottom - src_rect->top;