Module: wine Branch: master Commit: 58016408c2d12dbf35797f6910f9e9d14d941c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58016408c2d12dbf35797f6910... Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Sep 15 15:12:22 2017 +0200 wined3d: Don't claim SYSMEM location to be current if memory was evicted. 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 608447f..f35d5df 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3539,7 +3539,8 @@ static DWORD cpu_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit ERR("Failed to blit.\n"); wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); - return dst_texture->resource.map_binding | dst_location; + return dst_location | (dst_texture->sub_resources[dst_sub_resource_idx].locations + & dst_texture->resource.map_binding); } static const struct wined3d_blitter_ops cpu_blitter_ops =