[PATCH 3/4] wined3d: Allow layered clears.
Henri Verbeet
hverbeet at codeweavers.com
Wed Feb 24 15:57:04 CST 2021
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/d3d10core/tests/d3d10core.c | 4 ++--
dlls/d3d11/tests/d3d11.c | 4 ++--
dlls/wined3d/device.c | 6 ------
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c
index e8915aea8e79..a5b2620d98ad 100644
--- 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);
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index efbad45b35dc..a331baf48a00 100644
--- 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);
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 7405a38e13b8..aaf91a03947c 100644
--- 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);
--
2.20.1
More information about the wine-devel
mailing list