[PATCH 2/7] wined3d: Consider all the system memory locations when choosing the surface upload path.

[Matteo Bruni]

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
This should avoid repeated evicts and redownloads of textures updated
from non-SYSMEM simple locations (e.g. a texture used by the Source
engine during the initial video playback is updated via
UpdateSurface() from a surface in WINED3D_LOCATION_USER_MEMORY).

 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 f35d5df775..134b6d204f 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)
-- 
2.13.5