Henri Verbeet : wined3d: Use the resource access flags in wined3d_surface_blt().
Alexandre Julliard
julliard at winehq.org
Thu Feb 1 16:14:51 CST 2018
Module: wine
Branch: master
Commit: 74c97c9a56fe76e5452a37c7b2286ed7133d75f5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=74c97c9a56fe76e5452a37c7b2286ed7133d75f5
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Feb 1 03:25:33 2018 +0330
wined3d: Use the resource access flags in wined3d_surface_blt().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/surface.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 5f34ad0..388b803 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3854,10 +3854,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst
{
TRACE("Depth/stencil blit.\n");
- if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM)
- dst_location = dst_texture->resource.map_binding;
- else
+ if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)
dst_location = dst_texture->resource.draw_binding;
+ else
+ dst_location = dst_texture->resource.map_binding;
context = context_acquire(device, dst_texture, dst_sub_resource_idx);
valid_locations = device->blitter->ops->blitter_blit(device->blitter,
@@ -3959,10 +3959,10 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst
blit_op = WINED3D_BLIT_OP_RAW_BLIT;
}
- if (dst_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM)
- dst_location = dst_texture->resource.map_binding;
- else
+ if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)
dst_location = dst_texture->resource.draw_binding;
+ else
+ dst_location = dst_texture->resource.map_binding;
context = context_acquire(device, dst_texture, dst_sub_resource_idx);
valid_locations = device->blitter->ops->blitter_blit(device->blitter, blit_op, context,
More information about the wine-cvs
mailing list