Matteo Bruni : wined3d: Consider all the system memory locations when choosing the surface upload path.

[Alexandre Julliard]

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

Author: Matteo Bruni <mbruni(a)codeweavers.com>
Date:   Fri Sep 15 15:12:23 2017 +0200

wined3d: Consider all the system memory locations when choosing the surface upload path.

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 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 f35d5df..134b6d2 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3709,8 +3709,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst
     {
         blit_op = WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST;
     }
-    else if ((src_sub_resource->locations & WINED3D_LOCATION_SYSMEM)
-            && !(dst_sub_resource->locations & WINED3D_LOCATION_SYSMEM))
+    else if ((src_sub_resource->locations & surface_simple_locations)
+            && !(dst_sub_resource->locations & surface_simple_locations))
     {
         /* Upload */
         if (scale)