Stefan Dösinger : wined3d: Sysmem can be freed when user memory is used.

[Alexandre Julliard]

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

Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date:   Wed Jan 15 22:02:14 2014 +0100

wined3d: Sysmem can be freed when user memory is used.

---

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

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 3a0d327..586358a 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -614,8 +614,7 @@ void surface_prepare_map_memory(struct wined3d_surface *surface)
 
 static void surface_evict_sysmem(struct wined3d_surface *surface)
 {
-    if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE)
-            || surface->user_memory)
+    if (surface->resource.map_count || surface->flags & SFLAG_DONOTFREE)
         return;
 
     wined3d_resource_free_sysmem(&surface->resource);