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

[Alexandre Julliard]

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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Tue Apr 19 18:34:05 2016 +0200

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

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

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 72233bd..f358805 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2637,8 +2637,8 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win
     }
     else
     {
-        w = wined3d_texture_get_level_width(surface->container, surface->texture_level);
-        h = wined3d_texture_get_level_height(surface->container, surface->texture_level);
+        w = wined3d_texture_get_level_width(texture, surface->texture_level);
+        h = wined3d_texture_get_level_height(texture, surface->texture_level);
     }
 
     if (surface->current_renderbuffer)
@@ -2717,8 +2717,9 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win
         context_apply_fbo_state_blit(context, GL_FRAMEBUFFER,
                 context->swapchain->front_buffer->sub_resources[0].u.surface,
                 NULL, WINED3D_LOCATION_DRAWABLE);
-        surface_depth_blt(surface, context, texture->texture_rgb.name,
-                0, surface->pow2Height - h, w, h, surface->texture_target);
+        surface_depth_blt(surface, context, texture->texture_rgb.name, 0,
+                wined3d_texture_get_level_pow2_height(texture, surface->texture_level) - h,
+                w, h, surface->texture_target);
         checkGLcall("depth_blt");
 
         context_invalidate_state(context, STATE_FRAMEBUFFER);