[PATCH 1/3] ddraw/tests: Sync test_clear() with d3d8/9.
Henri Verbeet
hverbeet at codeweavers.com
Wed Jan 10 14:06:02 CST 2018
From: Stefan Dösinger <stefan at codeweavers.com>
Signed-off-by: Stefan Dösinger <stefan at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/ddraw/tests/ddraw1.c | 236 +++++++++++++++++++++++++++++++++++++++++++---
dlls/ddraw/tests/ddraw2.c | 218 +++++++++++++++++++++++++++++++++++++++---
dlls/ddraw/tests/ddraw4.c | 197 +++++++++++++++++++++++++++++++++++---
dlls/ddraw/tests/ddraw7.c | 154 +++++++++++++++++++++++++++---
dlls/ddraw/tests/visual.c | 47 ---------
5 files changed, 761 insertions(+), 91 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index d416cf55a3d..56521f6a4e3 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -105,31 +105,33 @@ static BOOL ddraw_is_warp(IDirectDraw *ddraw)
&& strstr(identifier.szDriver, "warp");
}
-static BOOL ddraw_is_nvidia(IDirectDraw *ddraw)
+static BOOL ddraw_is_vendor(IDirectDraw *ddraw, DWORD vendor)
{
DDDEVICEIDENTIFIER identifier;
return strcmp(winetest_platform, "wine")
&& ddraw_get_identifier(ddraw, &identifier)
- && identifier.dwVendorId == 0x10de;
+ && identifier.dwVendorId == vendor;
+}
+
+static BOOL ddraw_is_amd(IDirectDraw *ddraw)
+{
+ return ddraw_is_vendor(ddraw, 0x1002);
}
static BOOL ddraw_is_intel(IDirectDraw *ddraw)
{
- DDDEVICEIDENTIFIER identifier;
+ return ddraw_is_vendor(ddraw, 0x8086);
+}
- return strcmp(winetest_platform, "wine")
- && ddraw_get_identifier(ddraw, &identifier)
- && identifier.dwVendorId == 0x8086;
+static BOOL ddraw_is_nvidia(IDirectDraw *ddraw)
+{
+ return ddraw_is_vendor(ddraw, 0x10de);
}
static BOOL ddraw_is_vmware(IDirectDraw *ddraw)
{
- DDDEVICEIDENTIFIER identifier;
-
- return strcmp(winetest_platform, "wine")
- && ddraw_get_identifier(ddraw, &identifier)
- && identifier.dwVendorId == 0x15ad;
+ return ddraw_is_vendor(ddraw, 0x15ad);
}
static IDirectDrawSurface *create_overlay(IDirectDraw *ddraw,
@@ -10913,6 +10915,217 @@ static void test_depth_readback(void)
DestroyWindow(window);
}
+static void test_clear(void)
+{
+ D3DRECT rect_negneg, rect_full = {{0}, {0}, {640}, {480}};
+ IDirect3DViewport *viewport, *viewport2, *viewport3;
+ IDirect3DMaterial *white, *red, *green, *blue;
+ IDirect3DDevice *device;
+ IDirectDrawSurface *rt;
+ IDirectDraw *ddraw;
+ D3DRECT rect[2];
+ D3DCOLOR color;
+ ULONG refcount;
+ HWND window;
+ HRESULT hr;
+
+ window = create_window();
+ ddraw = create_ddraw();
+ ok(!!ddraw, "Failed to create a ddraw object.\n");
+ if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
+ {
+ skip("Failed to create a 3D device, skipping test.\n");
+ IDirectDraw_Release(ddraw);
+ DestroyWindow(window);
+ return;
+ }
+ hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt);
+ ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
+
+ viewport = create_viewport(device, 0, 0, 640, 480);
+
+ white = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f);
+ red = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f);
+ green = create_diffuse_material(device, 0.0f, 1.0f, 0.0f, 1.0f);
+ blue = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f);
+
+ viewport_set_background(device, viewport, white);
+ hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* Positive x, negative y. */
+ U1(rect[0]).x1 = 0;
+ U2(rect[0]).y1 = 480;
+ U3(rect[0]).x2 = 320;
+ U4(rect[0]).y2 = 240;
+
+ /* Positive x, positive y. */
+ U1(rect[1]).x1 = 0;
+ U2(rect[1]).y1 = 0;
+ U3(rect[1]).x2 = 320;
+ U4(rect[1]).y2 = 240;
+
+ /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not
+ * refuse negative rectangles, but it will not clear them either. */
+ viewport_set_background(device, viewport, red);
+ hr = IDirect3DViewport_Clear(viewport, 2, rect, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* negative x, negative y.
+ *
+ * FIXME: WARP seems to clear the entire screen here. */
+ rect_negneg.x1 = 640;
+ rect_negneg.y1 = 240;
+ rect_negneg.x2 = 320;
+ rect_negneg.y2 = 0;
+ viewport_set_background(device, viewport, green);
+ hr = IDirect3DViewport_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 160, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 160, 120);
+ ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 480, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 480, 120);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color);
+
+ /* Test how the viewport affects clears. */
+ viewport_set_background(device, viewport, white);
+ hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ viewport2 = create_viewport(device, 160, 120, 160, 120);
+ viewport_set_background(device, viewport2, blue);
+ hr = IDirect3DViewport_Clear(viewport2, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ viewport3 = create_viewport(device, 320, 240, 320, 240);
+ viewport_set_background(device, viewport3, green);
+
+ U1(rect[0]).x1 = 160;
+ U2(rect[0]).y1 = 120;
+ U3(rect[0]).x2 = 480;
+ U4(rect[0]).y2 = 360;
+ hr = IDirect3DViewport_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* AMD drivers do not limit the clear area to the viewport rectangle in
+ * d3d1. It works as intended on other drivers and on d3d2 and newer on
+ * AMD cards. */
+ color = get_surface_color(rt, 158, 118);
+ ok(compare_color(color, 0x00ffffff, 0)
+ || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x000000ff, 0)),
+ "(158, 118) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 162, 118);
+ ok(compare_color(color, 0x00ffffff, 0)
+ || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x000000ff, 0)),
+ "(162, 118) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 158, 122);
+ ok(compare_color(color, 0x00ffffff, 0)
+ || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x000000ff, 0)),
+ "(158, 122) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 162, 122);
+ ok(compare_color(color, 0x000000ff, 0)
+ || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x0000ff00, 0)),
+ "(162, 122) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 318, 238);
+ ok(compare_color(color, 0x000000ff, 0)
+ || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x0000ff00, 0)),
+ "(318, 238) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 322, 238);
+ ok(compare_color(color, 0x00ffffff, 0)
+ || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x0000ff00, 0)),
+ "(322, 328) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 318, 242);
+ ok(compare_color(color, 0x00ffffff, 0)
+ || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x0000ff00, 0)),
+ "(318, 242) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 322, 242);
+ ok(compare_color(color, 0x0000ff00, 0), "(322, 242) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 478, 358);
+ ok(compare_color(color, 0x0000ff00, 0), "(478, 358) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 482, 358);
+ ok(compare_color(color, 0x00ffffff, 0)
+ || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x000000ff, 0)),
+ "(482, 358) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 478, 362);
+ ok(compare_color(color, 0x00ffffff, 0)
+ || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x000000ff, 0)),
+ "(478, 362) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 482, 362);
+ ok(compare_color(color, 0x00ffffff, 0)
+ || broken(ddraw_is_amd(ddraw) && compare_color(color, 0x000000ff, 0)),
+ "(482, 362) has color 0x%08x.\n", color);
+
+ /* The clear rectangle is rendertarget absolute, not relative to the
+ * viewport. */
+ hr = IDirect3DViewport_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+ U1(rect[0]).x1 = 330;
+ U2(rect[0]).y1 = 250;
+ U3(rect[0]).x2 = 340;
+ U4(rect[0]).y2 = 260;
+ hr = IDirect3DViewport_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 328, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(328, 248) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 332, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(332, 248) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 328, 252);
+ ok(compare_color(color, 0x00ffffff, 0), "(328, 252) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 332, 252);
+ ok(compare_color(color, 0x0000ff00, 0), "(332, 252) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 338, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(338, 248) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 342, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(342, 248) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 338, 252);
+ ok(compare_color(color, 0x0000ff00, 0), "(338, 252) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 342, 252);
+ ok(compare_color(color, 0x00ffffff, 0), "(342, 252) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 328, 258);
+ ok(compare_color(color, 0x00ffffff, 0), "(328, 258) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 332, 258);
+ ok(compare_color(color, 0x0000ff00, 0), "(332, 258) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 328, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(328, 262) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 332, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(332, 262) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 338, 258);
+ ok(compare_color(color, 0x0000ff00, 0), "(338, 258) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 342, 258);
+ ok(compare_color(color, 0x00ffffff, 0), "(342, 258) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 338, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(338, 262) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 342, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(342, 262) has color 0x%08x.\n", color);
+
+ /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist
+ * in d3d1. */
+
+ IDirect3DViewport_Release(viewport3);
+ IDirect3DViewport_Release(viewport2);
+ IDirect3DViewport_Release(viewport);
+ IDirect3DMaterial_Release(white);
+ IDirect3DMaterial_Release(red);
+ IDirect3DMaterial_Release(green);
+ IDirect3DMaterial_Release(blue);
+ IDirectDrawSurface_Release(rt);
+ refcount = IDirect3DDevice_Release(device);
+ ok(!refcount, "Device has %u references left.\n", refcount);
+ refcount = IDirectDraw_Release(ddraw);
+ ok(!refcount, "Ddraw object has %u references left.\n", refcount);
+ DestroyWindow(window);
+}
+
START_TEST(ddraw1)
{
DDDEVICEIDENTIFIER identifier;
@@ -11012,4 +11225,5 @@ START_TEST(ddraw1)
test_texture_load();
test_ck_operation();
test_depth_readback();
+ test_clear();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 2186c314acc..9e4aebdef4b 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -107,31 +107,28 @@ static BOOL ddraw_is_warp(IDirectDraw2 *ddraw)
&& strstr(identifier.szDriver, "warp");
}
-static BOOL ddraw_is_nvidia(IDirectDraw2 *ddraw)
+static BOOL ddraw_is_vendor(IDirectDraw2 *ddraw, DWORD vendor)
{
DDDEVICEIDENTIFIER identifier;
return strcmp(winetest_platform, "wine")
&& ddraw_get_identifier(ddraw, &identifier)
- && identifier.dwVendorId == 0x10de;
+ && identifier.dwVendorId == vendor;
}
static BOOL ddraw_is_intel(IDirectDraw2 *ddraw)
{
- DDDEVICEIDENTIFIER identifier;
+ return ddraw_is_vendor(ddraw, 0x8086);
+}
- return strcmp(winetest_platform, "wine")
- && ddraw_get_identifier(ddraw, &identifier)
- && identifier.dwVendorId == 0x8086;
+static BOOL ddraw_is_nvidia(IDirectDraw2 *ddraw)
+{
+ return ddraw_is_vendor(ddraw, 0x10de);
}
static BOOL ddraw_is_vmware(IDirectDraw2 *ddraw)
{
- DDDEVICEIDENTIFIER identifier;
-
- return strcmp(winetest_platform, "wine")
- && ddraw_get_identifier(ddraw, &identifier)
- && identifier.dwVendorId == 0x15ad;
+ return ddraw_is_vendor(ddraw, 0x15ad);
}
static IDirectDrawSurface *create_overlay(IDirectDraw2 *ddraw,
@@ -12287,6 +12284,204 @@ static void test_depth_readback(void)
DestroyWindow(window);
}
+static void test_clear(void)
+{
+ D3DRECT rect_negneg, rect_full = {{0}, {0}, {640}, {480}};
+ IDirect3DViewport2 *viewport, *viewport2, *viewport3;
+ IDirect3DMaterial2 *white, *red, *green, *blue;
+ IDirect3DDevice2 *device;
+ IDirectDrawSurface *rt;
+ IDirectDraw2 *ddraw;
+ D3DRECT rect[2];
+ D3DCOLOR color;
+ ULONG refcount;
+ HWND window;
+ HRESULT hr;
+
+ window = create_window();
+ ddraw = create_ddraw();
+ ok(!!ddraw, "Failed to create a ddraw object.\n");
+ if (!(device = create_device(ddraw, window, DDSCL_NORMAL)))
+ {
+ skip("Failed to create a 3D device, skipping test.\n");
+ IDirectDraw2_Release(ddraw);
+ DestroyWindow(window);
+ return;
+ }
+ hr = IDirect3DDevice2_GetRenderTarget(device, &rt);
+ ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
+
+ viewport = create_viewport(device, 0, 0, 640, 480);
+ hr = IDirect3DDevice2_SetCurrentViewport(device, viewport);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ white = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f);
+ red = create_diffuse_material(device, 1.0f, 0.0f, 0.0f, 1.0f);
+ green = create_diffuse_material(device, 0.0f, 1.0f, 0.0f, 1.0f);
+ blue = create_diffuse_material(device, 0.0f, 0.0f, 1.0f, 1.0f);
+
+ viewport_set_background(device, viewport, white);
+ hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* Positive x, negative y. */
+ U1(rect[0]).x1 = 0;
+ U2(rect[0]).y1 = 480;
+ U3(rect[0]).x2 = 320;
+ U4(rect[0]).y2 = 240;
+
+ /* Positive x, positive y. */
+ U1(rect[1]).x1 = 0;
+ U2(rect[1]).y1 = 0;
+ U3(rect[1]).x2 = 320;
+ U4(rect[1]).y2 = 240;
+
+ /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not
+ * refuse negative rectangles, but it will not clear them either. */
+ viewport_set_background(device, viewport, red);
+ hr = IDirect3DViewport2_Clear(viewport, 2, rect, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* negative x, negative y.
+ *
+ * FIXME: WARP seems to clear the entire screen here. */
+ rect_negneg.x1 = 640;
+ rect_negneg.y1 = 240;
+ rect_negneg.x2 = 320;
+ rect_negneg.y2 = 0;
+ viewport_set_background(device, viewport, green);
+ hr = IDirect3DViewport2_Clear(viewport, 1, &rect_negneg, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 160, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 160, 120);
+ ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 480, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 480, 120);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color);
+
+ /* Test how the viewport affects clears. */
+ viewport_set_background(device, viewport, white);
+ hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ viewport2 = create_viewport(device, 160, 120, 160, 120);
+ hr = IDirect3DDevice2_SetCurrentViewport(device, viewport2);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ viewport_set_background(device, viewport2, blue);
+ hr = IDirect3DViewport2_Clear(viewport2, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ viewport3 = create_viewport(device, 320, 240, 320, 240);
+ hr = IDirect3DDevice2_SetCurrentViewport(device, viewport3);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ U1(rect[0]).x1 = 160;
+ U2(rect[0]).y1 = 120;
+ U3(rect[0]).x2 = 480;
+ U4(rect[0]).y2 = 360;
+ viewport_set_background(device, viewport3, green);
+ hr = IDirect3DViewport2_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice2_SetCurrentViewport(device, viewport);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 158, 118);
+ ok(compare_color(color, 0x00ffffff, 0), "(158, 118) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 162, 118);
+ ok(compare_color(color, 0x00ffffff, 0), "(162, 118) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 158, 122);
+ ok(compare_color(color, 0x00ffffff, 0), "(158, 122) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 162, 122);
+ ok(compare_color(color, 0x000000ff, 0), "(162, 122) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 318, 238);
+ ok(compare_color(color, 0x000000ff, 0), "(318, 238) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 322, 238);
+ ok(compare_color(color, 0x00ffffff, 0), "(322, 238) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 318, 242);
+ ok(compare_color(color, 0x00ffffff, 0), "(318, 242) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 322, 242);
+ ok(compare_color(color, 0x0000ff00, 0), "(322, 242) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 478, 358);
+ ok(compare_color(color, 0x0000ff00, 0), "(478, 358) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 482, 358);
+ ok(compare_color(color, 0x00ffffff, 0), "(482, 358) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 478, 362);
+ ok(compare_color(color, 0x00ffffff, 0), "(478, 362) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 482, 362);
+ ok(compare_color(color, 0x00ffffff, 0), "(482, 362) has color 0x%08x.\n", color);
+
+ /* The clear rectangle is rendertarget absolute, not relative to the
+ * viewport. */
+ hr = IDirect3DViewport2_Clear(viewport, 1, &rect_full, D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+ U1(rect[0]).x1 = 330;
+ U2(rect[0]).y1 = 250;
+ U3(rect[0]).x2 = 340;
+ U4(rect[0]).y2 = 260;
+ hr = IDirect3DViewport2_Clear(viewport3, 1, &rect[0], D3DCLEAR_TARGET);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 328, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(328, 248) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 332, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(332, 248) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 328, 252);
+ ok(compare_color(color, 0x00ffffff, 0), "(328, 252) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 332, 252);
+ ok(compare_color(color, 0x0000ff00, 0), "(332, 252) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 338, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(338, 248) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 342, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(342, 248) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 338, 252);
+ ok(compare_color(color, 0x0000ff00, 0), "(338, 252) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 342, 252);
+ ok(compare_color(color, 0x00ffffff, 0), "(342, 252) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 328, 258);
+ ok(compare_color(color, 0x00ffffff, 0), "(328, 258) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 332, 258);
+ ok(compare_color(color, 0x0000ff00, 0), "(332, 258) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 328, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(328, 262) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 332, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(332, 262) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 338, 258);
+ ok(compare_color(color, 0x0000ff00, 0), "(338, 258) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 342, 258);
+ ok(compare_color(color, 0x00ffffff, 0), "(342, 258) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 338, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(338, 262) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 342, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(342, 262) has color 0x%08x.\n", color);
+
+ /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist
+ * in d3d2. */
+
+ IDirect3DViewport2_Release(viewport3);
+ IDirect3DViewport2_Release(viewport2);
+ IDirect3DViewport2_Release(viewport);
+ IDirect3DMaterial2_Release(white);
+ IDirect3DMaterial2_Release(red);
+ IDirect3DMaterial2_Release(green);
+ IDirect3DMaterial2_Release(blue);
+ IDirectDrawSurface_Release(rt);
+ refcount = IDirect3DDevice2_Release(device);
+ ok(!refcount, "Device has %u references left.\n", refcount);
+ refcount = IDirectDraw2_Release(ddraw);
+ ok(!refcount, "Ddraw object has %u references left.\n", refcount);
+ DestroyWindow(window);
+}
+
START_TEST(ddraw2)
{
DDDEVICEIDENTIFIER identifier;
@@ -12394,4 +12589,5 @@ START_TEST(ddraw2)
test_surface_desc_size();
test_ck_operation();
test_depth_readback();
+ test_clear();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 4c1bd78eefc..e4b65a5ca1f 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -113,31 +113,28 @@ static BOOL ddraw_is_warp(IDirectDraw4 *ddraw)
&& strstr(identifier.szDriver, "warp");
}
-static BOOL ddraw_is_nvidia(IDirectDraw4 *ddraw)
+static BOOL ddraw_is_vendor(IDirectDraw4 *ddraw, DWORD vendor)
{
DDDEVICEIDENTIFIER identifier;
return strcmp(winetest_platform, "wine")
&& ddraw_get_identifier(ddraw, &identifier)
- && identifier.dwVendorId == 0x10de;
+ && identifier.dwVendorId == vendor;
}
static BOOL ddraw_is_intel(IDirectDraw4 *ddraw)
{
- DDDEVICEIDENTIFIER identifier;
+ return ddraw_is_vendor(ddraw, 0x8086);
+}
- return strcmp(winetest_platform, "wine")
- && ddraw_get_identifier(ddraw, &identifier)
- && identifier.dwVendorId == 0x8086;
+static BOOL ddraw_is_nvidia(IDirectDraw4 *ddraw)
+{
+ return ddraw_is_vendor(ddraw, 0x10de);
}
static BOOL ddraw_is_vmware(IDirectDraw4 *ddraw)
{
- DDDEVICEIDENTIFIER identifier;
-
- return strcmp(winetest_platform, "wine")
- && ddraw_get_identifier(ddraw, &identifier)
- && identifier.dwVendorId == 0x15ad;
+ return ddraw_is_vendor(ddraw, 0x15ad);
}
static IDirectDrawSurface4 *create_overlay(IDirectDraw4 *ddraw,
@@ -14355,6 +14352,183 @@ static void test_depth_readback(void)
DestroyWindow(window);
}
+static void test_clear(void)
+{
+ D3DRECT rect_negneg, rect_full = {{0}, {0}, {640}, {480}};
+ IDirect3DViewport3 *viewport, *viewport2, *viewport3;
+ IDirect3DDevice3 *device;
+ IDirectDrawSurface4 *rt;
+ D3DRECT rect[2];
+ D3DCOLOR color;
+ ULONG refcount;
+ HWND window;
+ HRESULT hr;
+
+ window = create_window();
+ if (!(device = create_device(window, DDSCL_NORMAL)))
+ {
+ skip("Failed to create 3D device.\n");
+ DestroyWindow(window);
+ return;
+ }
+
+ hr = IDirect3DDevice3_GetRenderTarget(device, &rt);
+ ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
+
+ viewport = create_viewport(device, 0, 0, 640, 480);
+ hr = IDirect3DDevice3_SetCurrentViewport(device, viewport);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* Positive x, negative y. */
+ U1(rect[0]).x1 = 0;
+ U2(rect[0]).y1 = 480;
+ U3(rect[0]).x2 = 320;
+ U4(rect[0]).y2 = 240;
+
+ /* Positive x, positive y. */
+ U1(rect[1]).x1 = 0;
+ U2(rect[1]).y1 = 0;
+ U3(rect[1]).x2 = 320;
+ U4(rect[1]).y2 = 240;
+
+ /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not
+ * refuse negative rectangles, but it will not clear them either. */
+ hr = IDirect3DViewport3_Clear2(viewport, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* negative x, negative y.
+ *
+ * FIXME: WARP seems to clear the entire screen here. */
+ rect_negneg.x1 = 640;
+ rect_negneg.y1 = 240;
+ rect_negneg.x2 = 320;
+ rect_negneg.y2 = 0;
+ hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 160, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 160, 120);
+ ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 480, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 480, 120);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color);
+
+ /* Test how the viewport affects clears. */
+ hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ viewport2 = create_viewport(device, 160, 120, 160, 120);
+ hr = IDirect3DDevice3_SetCurrentViewport(device, viewport2);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ hr = IDirect3DViewport3_Clear2(viewport2, 1, &rect_full, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ viewport3 = create_viewport(device, 320, 240, 320, 240);
+ hr = IDirect3DDevice3_SetCurrentViewport(device, viewport3);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ U1(rect[0]).x1 = 160;
+ U2(rect[0]).y1 = 120;
+ U3(rect[0]).x2 = 480;
+ U4(rect[0]).y2 = 360;
+ hr = IDirect3DViewport3_Clear2(viewport3, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice3_SetCurrentViewport(device, viewport);
+ ok(SUCCEEDED(hr), "Failed to set current viewport, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 158, 118);
+ ok(compare_color(color, 0x00ffffff, 0), "(158, 118) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 162, 118);
+ ok(compare_color(color, 0x00ffffff, 0), "(162, 118) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 158, 122);
+ ok(compare_color(color, 0x00ffffff, 0), "(158, 122) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 162, 122);
+ ok(compare_color(color, 0x000000ff, 0), "(162, 122) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 318, 238);
+ ok(compare_color(color, 0x000000ff, 0), "(318, 238) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 322, 238);
+ ok(compare_color(color, 0x00ffffff, 0), "(322, 328) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 318, 242);
+ ok(compare_color(color, 0x00ffffff, 0), "(318, 242) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 322, 242);
+ ok(compare_color(color, 0x0000ff00, 0), "(322, 242) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 478, 358);
+ ok(compare_color(color, 0x0000ff00, 0), "(478, 358) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 482, 358);
+ ok(compare_color(color, 0x00ffffff, 0), "(482, 358) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 478, 362);
+ ok(compare_color(color, 0x00ffffff, 0), "(478, 362) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 482, 362);
+ ok(compare_color(color, 0x00ffffff, 0), "(482, 362) has color 0x%08x.\n", color);
+
+ /* The clear rectangle is rendertarget absolute, not relative to the
+ * viewport. */
+ hr = IDirect3DViewport3_Clear2(viewport, 1, &rect_full, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+ U1(rect[0]).x1 = 330;
+ U2(rect[0]).y1 = 250;
+ U3(rect[0]).x2 = 340;
+ U4(rect[0]).y2 = 260;
+ hr = IDirect3DViewport3_Clear2(viewport3, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 328, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(328, 248) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 332, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(332, 248) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 328, 252);
+ ok(compare_color(color, 0x00ffffff, 0), "(328, 252) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 332, 252);
+ ok(compare_color(color, 0x0000ff00, 0), "(332, 252) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 338, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(338, 248) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 342, 248);
+ ok(compare_color(color, 0x00ffffff, 0), "(342, 248) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 338, 252);
+ ok(compare_color(color, 0x0000ff00, 0), "(338, 252) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 342, 252);
+ ok(compare_color(color, 0x00ffffff, 0), "(342, 252) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 328, 258);
+ ok(compare_color(color, 0x00ffffff, 0), "(328, 258) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 332, 258);
+ ok(compare_color(color, 0x0000ff00, 0), "(332, 258) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 328, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(328, 262) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 332, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(332, 262) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 338, 258);
+ ok(compare_color(color, 0x0000ff00, 0), "(338, 258) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 342, 258);
+ ok(compare_color(color, 0x00ffffff, 0), "(342, 258) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 338, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(338, 262) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 342, 262);
+ ok(compare_color(color, 0x00ffffff, 0), "(342, 262) has color 0x%08x.\n", color);
+
+ /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist
+ * in d3d3. */
+
+ IDirect3DViewport3_Release(viewport3);
+ IDirect3DViewport3_Release(viewport2);
+ IDirect3DViewport3_Release(viewport);
+ IDirectDrawSurface4_Release(rt);
+ refcount = IDirect3DDevice3_Release(device);
+ ok(!refcount, "Device has %u references left.\n", refcount);
+ DestroyWindow(window);
+}
+
START_TEST(ddraw4)
{
DDDEVICEIDENTIFIER identifier;
@@ -14475,4 +14649,5 @@ START_TEST(ddraw4)
test_compute_sphere_visibility();
test_map_synchronisation();
test_depth_readback();
+ test_clear();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index d7355cf0ea7..5b29f9cd13e 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -127,31 +127,28 @@ static BOOL ddraw_is_warp(IDirectDraw7 *ddraw)
&& strstr(identifier.szDriver, "warp");
}
-static BOOL ddraw_is_nvidia(IDirectDraw7 *ddraw)
+static BOOL ddraw_is_vendor(IDirectDraw7 *ddraw, DWORD vendor)
{
DDDEVICEIDENTIFIER2 identifier;
return strcmp(winetest_platform, "wine")
&& ddraw_get_identifier(ddraw, &identifier)
- && identifier.dwVendorId == 0x10de;
+ && identifier.dwVendorId == vendor;
}
static BOOL ddraw_is_intel(IDirectDraw7 *ddraw)
{
- DDDEVICEIDENTIFIER2 identifier;
+ return ddraw_is_vendor(ddraw, 0x8086);
+}
- return strcmp(winetest_platform, "wine")
- && ddraw_get_identifier(ddraw, &identifier)
- && identifier.dwVendorId == 0x8086;
+static BOOL ddraw_is_nvidia(IDirectDraw7 *ddraw)
+{
+ return ddraw_is_vendor(ddraw, 0x10de);
}
static BOOL ddraw_is_vmware(IDirectDraw7 *ddraw)
{
- DDDEVICEIDENTIFIER2 identifier;
-
- return strcmp(winetest_platform, "wine")
- && ddraw_get_identifier(ddraw, &identifier)
- && identifier.dwVendorId == 0x15ad;
+ return ddraw_is_vendor(ddraw, 0x15ad);
}
static IDirectDrawSurface7 *create_overlay(IDirectDraw7 *ddraw,
@@ -13726,6 +13723,140 @@ static void test_depth_readback(void)
DestroyWindow(window);
}
+static void test_clear(void)
+{
+ IDirect3DDevice7 *device;
+ IDirectDrawSurface7 *rt;
+ D3DVIEWPORT7 vp, old_vp;
+ D3DRECT rect_negneg;
+ D3DRECT rect[2];
+ D3DCOLOR color;
+ ULONG refcount;
+ HWND window;
+ HRESULT hr;
+
+ window = create_window();
+ if (!(device = create_device(window, DDSCL_NORMAL)))
+ {
+ skip("Failed to create 3D device.\n");
+ DestroyWindow(window);
+ return;
+ }
+
+ hr = IDirect3DDevice7_GetRenderTarget(device, &rt);
+ ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* Positive x, negative y. */
+ U1(rect[0]).x1 = 0;
+ U2(rect[0]).y1 = 480;
+ U3(rect[0]).x2 = 320;
+ U4(rect[0]).y2 = 240;
+
+ /* Positive x, positive y. */
+ U1(rect[1]).x1 = 0;
+ U2(rect[1]).y1 = 0;
+ U3(rect[1]).x2 = 320;
+ U4(rect[1]).y2 = 240;
+
+ /* Clear 2 rectangles with one call. Unlike d3d8/9, the refrast does not
+ * refuse negative rectangles, but it will not clear them either. */
+ hr = IDirect3DDevice7_Clear(device, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0f, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ /* negative x, negative y.
+ *
+ * FIXME: WARP seems to clear the entire screen here. */
+ rect_negneg.x1 = 640;
+ rect_negneg.y1 = 240;
+ rect_negneg.x2 = 320;
+ rect_negneg.y2 = 0;
+ hr = IDirect3DDevice7_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 160, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 3 (pos, neg) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 160, 120);
+ ok(compare_color(color, 0x00ff0000, 0), "Clear rectangle 1 (pos, pos) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 480, 360);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (NULL) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 480, 120);
+ ok(compare_color(color, 0x00ffffff, 0), "Clear rectangle 4 (neg, neg) has color 0x%08x.\n", color);
+
+ /* Test how the viewport affects clears. */
+ hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+ hr = IDirect3DDevice7_GetViewport(device, &old_vp);
+ ok(SUCCEEDED(hr), "Failed to get viewport, hr %#x.\n", hr);
+
+ vp.dwX = 160;
+ vp.dwY = 120;
+ vp.dwWidth = 160;
+ vp.dwHeight = 120;
+ vp.dvMinZ = 0.0f;
+ vp.dvMaxZ = 1.0f;
+ hr = IDirect3DDevice7_SetViewport(device, &vp);
+ ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr);
+ hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ vp.dwX = 320;
+ vp.dwY = 240;
+ vp.dwWidth = 320;
+ vp.dwHeight = 240;
+ vp.dvMinZ = 0.0f;
+ vp.dvMaxZ = 1.0f;
+ hr = IDirect3DDevice7_SetViewport(device, &vp);
+ ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr);
+
+ U1(rect[0]).x1 = 160;
+ U2(rect[0]).y1 = 120;
+ U3(rect[0]).x2 = 480;
+ U4(rect[0]).y2 = 360;
+ hr = IDirect3DDevice7_Clear(device, 1, &rect[0], D3DCLEAR_TARGET, 0xff00ff00, 0.0f, 0);
+ ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
+
+ hr = IDirect3DDevice7_SetViewport(device, &old_vp);
+ ok(SUCCEEDED(hr), "Failed to set viewport, hr %#x.\n", hr);
+
+ color = get_surface_color(rt, 158, 118);
+ ok(compare_color(color, 0x00ffffff, 0), "(158, 118) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 162, 118);
+ ok(compare_color(color, 0x00ffffff, 0), "(162, 118) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 158, 122);
+ ok(compare_color(color, 0x00ffffff, 0), "(158, 122) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 162, 122);
+ ok(compare_color(color, 0x000000ff, 0), "(162, 122) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 318, 238);
+ ok(compare_color(color, 0x000000ff, 0), "(318, 238) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 322, 238);
+ ok(compare_color(color, 0x00ffffff, 0), "(322, 328) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 318, 242);
+ ok(compare_color(color, 0x00ffffff, 0), "(318, 242) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 322, 242);
+ ok(compare_color(color, 0x0000ff00, 0), "(322, 242) has color 0x%08x.\n", color);
+
+ color = get_surface_color(rt, 478, 358);
+ ok(compare_color(color, 0x0000ff00, 0), "(478, 358) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 482, 358);
+ ok(compare_color(color, 0x00ffffff, 0), "(482, 358) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 478, 362);
+ ok(compare_color(color, 0x00ffffff, 0), "(478, 362) has color 0x%08x.\n", color);
+ color = get_surface_color(rt, 482, 362);
+ ok(compare_color(color, 0x00ffffff, 0), "(482, 362) has color 0x%08x.\n", color);
+
+ /* COLORWRITEENABLE, SRGBWRITEENABLE and scissor rectangles do not exist
+ * in d3d7. */
+
+ IDirectDrawSurface7_Release(rt);
+ refcount = IDirect3DDevice7_Release(device);
+ ok(!refcount, "Device has %u references left.\n", refcount);
+ DestroyWindow(window);
+}
+
START_TEST(ddraw7)
{
DDDEVICEIDENTIFIER2 identifier;
@@ -13856,4 +13987,5 @@ START_TEST(ddraw7)
test_clip_planes_limits();
test_map_synchronisation();
test_depth_readback();
+ test_clear();
}
diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c
index 4f6213354d6..2cb1c892314 100644
--- a/dlls/ddraw/tests/visual.c
+++ b/dlls/ddraw/tests/visual.c
@@ -267,52 +267,6 @@ static void set_viewport_size(IDirect3DDevice7 *device)
return;
}
-static void clear_test(IDirect3DDevice7 *device)
-{
- /* Tests the correctness of clearing parameters */
- HRESULT hr;
- D3DRECT rect[2];
- D3DRECT rect_negneg;
- DWORD color;
-
- hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0, 0);
- ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr);
-
- /* Positive x, negative y */
- U1(rect[0]).x1 = 0;
- U2(rect[0]).y1 = 480;
- U3(rect[0]).x2 = 320;
- U4(rect[0]).y2 = 240;
-
- /* Positive x, positive y */
- U1(rect[1]).x1 = 0;
- U2(rect[1]).y1 = 0;
- U3(rect[1]).x2 = 320;
- U4(rect[1]).y2 = 240;
- /* Clear 2 rectangles with one call. Shows that a positive value is returned, but the negative rectangle
- * is ignored, the positive is still cleared afterwards
- */
- hr = IDirect3DDevice7_Clear(device, 2, rect, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0);
- ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr);
-
- /* negative x, negative y */
- U1(rect_negneg).x1 = 640;
- U2(rect_negneg).y1 = 240;
- U3(rect_negneg).x2 = 320;
- U4(rect_negneg).y2 = 0;
- hr = IDirect3DDevice7_Clear(device, 1, &rect_negneg, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0);
- ok(hr == D3D_OK, "IDirect3DDevice7_Clear failed with %08x\n", hr);
-
- color = getPixelColor(device, 160, 360); /* lower left quad */
- ok(color == 0x00ffffff, "Clear rectangle 3(pos, neg) has color %08x\n", color);
- color = getPixelColor(device, 160, 120); /* upper left quad */
- ok(color == 0x00ff0000, "Clear rectangle 1(pos, pos) has color %08x\n", color);
- color = getPixelColor(device, 480, 360); /* lower right quad */
- ok(color == 0x00ffffff, "Clear rectangle 4(NULL) has color %08x\n", color);
- color = getPixelColor(device, 480, 120); /* upper right quad */
- ok(color == 0x00ffffff, "Clear rectangle 4(neg, neg) has color %08x\n", color);
-}
-
static void fog_test(IDirect3DDevice7 *device)
{
HRESULT hr;
@@ -1681,7 +1635,6 @@ START_TEST(visual)
/* Now run the tests */
depth_clamp_test(Direct3DDevice);
- clear_test(Direct3DDevice);
fog_test(Direct3DDevice);
offscreen_test(Direct3DDevice);
test_blend(Direct3DDevice);
--
2.11.0
More information about the wine-devel
mailing list