wined3d: Avoid using the CPU blitter for clearing converted surfaces that aren't…

wined3d: Avoid using the CPU blitter for clearing converted surfaces that aren't current on the CPU. Since that would imply reading them back, with associated format conversion. Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Avoid using the CPU blitter for clearing converted surfaces that aren't…
990be0ba · Henri Verbeet · Alexandre Julliard · 92d030c4 · 990be0ba
Commit 990be0ba authored Jul 17, 2017 by Henri Verbeet Committed by Alexandre Julliard Jul 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 7 deletions

surface.c dlls/wined3d/surface.c +4 -7

No files found.
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2551,17 +2551,14 @@ static BOOL ffp_blitter_use_cpu_clear(struct wined3d_rendertarget_view *view)
    struct wined3d_texture *texture;
    resource = view->resource;
-    if (resource->pool == WINED3D_POOL_SYSTEM_MEM)
-        return TRUE;
    if (resource->type == WINED3D_RTYPE_BUFFER)
-        return FALSE;
+        return resource->pool == WINED3D_POOL_SYSTEM_MEM;
    texture = texture_from_resource(resource);
-    if (!(texture->flags & WINED3D_TEXTURE_PIN_SYSMEM))
+    if (texture->sub_resources[view->sub_resource_idx].locations & resource->map_binding)
-        return FALSE;
+        return resource->pool == WINED3D_POOL_SYSTEM_MEM || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM);
-    return texture->sub_resources[view->sub_resource_idx].locations & resource->map_binding;
+    return resource->pool == WINED3D_POOL_SYSTEM_MEM && !(texture->flags & WINED3D_TEXTURE_CONVERTED);
 }
 static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device,