Stefan Dösinger : wined3d: Prepare GL textures in surface_load_ds_location.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 916570d44e1ff7d0319fea9107ae93763ab417d3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=916570d44e1ff7d0319fea9107...

Author: Stefan Dösinger <stefandoesinger(a)gmx.at>
Date:   Sun Jan 17 14:40:04 2016 +0000

wined3d: Prepare GL textures in surface_load_ds_location.

Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 638f6c1ac81a4be0ff3f290a81bc5d3472262839)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/wined3d/surface.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index f8a1ba1..072c0ee 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3661,10 +3661,10 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co
         return;
     }
 
+    wined3d_surface_prepare(surface, context, location);
     if (surface->locations & WINED3D_LOCATION_DISCARDED)
     {
         TRACE("Surface was discarded, no need copy data.\n");
-        wined3d_surface_prepare(surface, context, location);
         surface->locations &= ~WINED3D_LOCATION_DISCARDED;
         surface->locations |= location;
         surface->ds_current_size.cx = surface->resource.width;