From 4ef9f113c9d168521fe046db2ff84f8217b394df Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 5 Apr 2016 18:24:21 +0200 Subject: [PATCH] wined3d: Use the texture dimension helpers in surface_upload_from_surface(). Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- 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 0055e622ec8..b6e8f997229 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; -- 2.11.4.GIT