Henri Verbeet : wined3d: Avoid surface_from_resource() in surface_load_ds_location().

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Mon Apr  4 18:43:01 2016 +0200

wined3d: Avoid surface_from_resource() in surface_load_ds_location().

Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 2b8db06..16d03e8 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2861,7 +2861,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win
         /* Note that we use depth_blt here as well, rather than glCopyTexImage2D
          * directly on the FBO texture. That's because we need to flip. */
         context_apply_fbo_state_blit(context, GL_FRAMEBUFFER,
-                surface_from_resource(wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)),
+                wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)->u.surface,
                 NULL, WINED3D_LOCATION_DRAWABLE);
         if (surface->texture_target == GL_TEXTURE_RECTANGLE_ARB)
         {
@@ -2907,7 +2907,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win
         TRACE("Copying depth texture to onscreen depth buffer.\n");

context_apply_fbo_state_blit(context, GL_FRAMEBUFFER,
-                surface_from_resource(wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)),
+                wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 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);