wined3d: Use the resource access flags in ffp_blitter_use_cpu_clear().

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Use the resource access flags in ffp_blitter_use_cpu_clear().
4928e38c · Henri Verbeet · Alexandre Julliard · df715e5a · 4928e38c
Commit 4928e38c authored Feb 01, 2018 by Henri Verbeet Committed by Alexandre Julliard Feb 01, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

surface.c dlls/wined3d/surface.c +5 -3

No files found.
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2744,14 +2744,16 @@ static BOOL ffp_blitter_use_cpu_clear(struct wined3d_rendertarget_view *view)

    resource = view->resource;
    if (resource->type == WINED3D_RTYPE_BUFFER)
-        return resource->pool == WINED3D_POOL_SYSTEM_MEM;
+        return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU);

    texture = texture_from_resource(resource);
    locations = texture->sub_resources[view->sub_resource_idx].locations;
    if (locations & (resource->map_binding | WINED3D_LOCATION_DISCARDED))
-        return resource->pool == WINED3D_POOL_SYSTEM_MEM || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM);
+        return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU)
+                || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM);

-    return resource->pool == WINED3D_POOL_SYSTEM_MEM && !(texture->flags & WINED3D_TEXTURE_CONVERTED);
+    return !(resource->access & WINED3D_RESOURCE_ACCESS_GPU)
+            && !(texture->flags & WINED3D_TEXTURE_CONVERTED);
 }

 static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device,