wined3d: Avoid using the CPU blitter for clearing either depth or stencil on combined formats.

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

wined3d: Avoid using the CPU blitter for clearing either depth or stencil on combined formats.
92d030c4 · Henri Verbeet · Alexandre Julliard · a9a5f371 · 92d030c4
Commit 92d030c4 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 2 deletions

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

No files found.
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -2595,8 +2595,10 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de
        }
    }

-    if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL))
-            && (view = fb->depth_stencil) && ffp_blitter_use_cpu_clear(view))
+    if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) && (view = fb->depth_stencil)
+            && (!view->format->depth_size || (flags & WINED3DCLEAR_ZBUFFER))
+            && (!view->format->stencil_size || (flags & WINED3DCLEAR_STENCIL))
+            && ffp_blitter_use_cpu_clear(view))
    {
        next_flags |= flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL);
        flags &= ~(WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL);