wined3d: Allow layered clears.

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

wined3d: Allow layered clears.
25e07835 · Henri Verbeet · Alexandre Julliard · 8c91486e · 25e07835 · 25e07835
Commit 25e07835 authored Feb 24, 2021 by Henri Verbeet Committed by Alexandre Julliard Feb 25, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 10 deletions

d3d10core.c dlls/d3d10core/tests/d3d10core.c +2 -2

d3d11.c dlls/d3d11/tests/d3d11.c +2 -2

device.c dlls/wined3d/device.c +0 -6

No files found.
--- a/dlls/d3d10core/tests/d3d10core.c
+++ b/dlls/d3d10core/tests/d3d10core.c
@@ -11235,12 +11235,12 @@ static void test_clear_render_target_view_2d(void)

    get_texture_readback(texture, 0, &rb);
    colour = get_readback_color(&rb, 8, 8);
-    todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour);
+    ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour);
    release_resource_readback(&rb);

    get_texture_readback(texture, 1, &rb);
    colour = get_readback_color(&rb, 8, 8);
-    todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour);
+    ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour);
    release_resource_readback(&rb);

    get_texture_readback(texture, 2, &rb);

--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -15565,12 +15565,12 @@ static void test_clear_render_target_view_2d(void)

    get_texture_readback(texture, 0, &rb);
    colour = get_readback_color(&rb, 8, 8, 0);
-    todo_wine ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour);
+    ok(compare_color(colour, 0x80ff0000, 1), "Got unexpected colour 0x%08x.\n", colour);
    release_resource_readback(&rb);

    get_texture_readback(texture, 1, &rb);
    colour = get_readback_color(&rb, 8, 8, 0);
-    todo_wine ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour);
+    ok(compare_color(colour, 0x8000ff00, 1), "Got unexpected colour 0x%08x.\n", colour);
    release_resource_readback(&rb);

    get_texture_readback(texture, 2, &rb);
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5093,12 +5093,6 @@ HRESULT CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *devi
        return WINED3DERR_INVALIDCALL;
    }

-    if (view->layer_count != max(1, resource->depth >> view->desc.u.texture.level_idx))
-    {
-        FIXME("Layered clears not implemented.\n");
-        return WINED3DERR_INVALIDCALL;
-    }
-
    if (!rect)
    {
        SetRect(&r, 0, 0, view->width, view->height);