[PATCH 3/7] ddraw/tests: Add tests for 32-bit depth format support.
Henri Verbeet
hverbeet at codeweavers.com
Mon Jun 24 16:59:44 CDT 2019
From: Jactry Zeng <jzeng at codeweavers.com>
Signed-off-by: Jactry Zeng <jzeng at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
This supersedes patch 166637.
dlls/ddraw/tests/ddraw1.c | 50 +++++++++++++++++++++++++++++++++++++++++
dlls/ddraw/tests/ddraw2.c | 50 +++++++++++++++++++++++++++++++++++++++++
dlls/ddraw/tests/ddraw4.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++
dlls/ddraw/tests/ddraw7.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 214 insertions(+)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c
index 860e101159f..7f5e697e7af 100644
--- a/dlls/ddraw/tests/ddraw1.c
+++ b/dlls/ddraw/tests/ddraw1.c
@@ -12899,6 +12899,55 @@ static void test_caps(void)
IDirectDraw_Release(ddraw);
}
+static void test_d32_support(void)
+{
+ IDirectDrawSurface *surface;
+ DDSURFACEDESC surface_desc;
+ IDirect3DDevice *device;
+ IDirectDraw *ddraw;
+ BOOL hw = FALSE;
+ 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)))
+ {
+ IDirect3DDevice_Release(device);
+ hw = TRUE;
+ }
+
+ hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ memset(&surface_desc, 0, sizeof(surface_desc));
+ surface_desc.dwSize = sizeof(surface_desc);
+ surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT;
+ surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER;
+ U2(surface_desc).dwZBufferBitDepth = 32;
+ surface_desc.dwWidth = 64;
+ surface_desc.dwHeight = 64;
+ hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ memset(&surface_desc, 0, sizeof(surface_desc));
+ surface_desc.dwSize = sizeof(surface_desc);
+ hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ ok((surface_desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags %#x.\n", surface_desc.dwFlags);
+ ok(U2(surface_desc).dwZBufferBitDepth == 32,
+ "Got unexpected dwZBufferBitDepth %u.\n", U2(surface_desc).dwZBufferBitDepth);
+ todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY),
+ "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps);
+ IDirectDrawSurface_Release(surface);
+
+ refcount = IDirectDraw_Release(ddraw);
+ ok(!refcount, "%u references left.\n", refcount);
+ DestroyWindow(window);
+}
+
START_TEST(ddraw1)
{
DDDEVICEIDENTIFIER identifier;
@@ -13010,4 +13059,5 @@ START_TEST(ddraw1)
test_alphatest();
test_clipper_refcount();
test_caps();
+ test_d32_support();
}
diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
index 2c047a5e1ff..75b848d1e28 100644
--- a/dlls/ddraw/tests/ddraw2.c
+++ b/dlls/ddraw/tests/ddraw2.c
@@ -13775,6 +13775,55 @@ static void test_caps(void)
IDirectDraw2_Release(ddraw);
}
+static void test_d32_support(void)
+{
+ IDirectDrawSurface *surface;
+ DDSURFACEDESC surface_desc;
+ IDirect3DDevice2 *device;
+ IDirectDraw2 *ddraw;
+ BOOL hw = FALSE;
+ 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)))
+ {
+ IDirect3DDevice2_Release(device);
+ hw = TRUE;
+ }
+
+ hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ memset(&surface_desc, 0, sizeof(surface_desc));
+ surface_desc.dwSize = sizeof(surface_desc);
+ surface_desc.dwFlags = DDSD_CAPS | DDSD_ZBUFFERBITDEPTH | DDSD_WIDTH | DDSD_HEIGHT;
+ surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER;
+ U2(surface_desc).dwZBufferBitDepth = 32;
+ surface_desc.dwWidth = 64;
+ surface_desc.dwHeight = 64;
+ hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ memset(&surface_desc, 0, sizeof(surface_desc));
+ surface_desc.dwSize = sizeof(surface_desc);
+ hr = IDirectDrawSurface_GetSurfaceDesc(surface, &surface_desc);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ ok((surface_desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags %#x.\n", surface_desc.dwFlags);
+ ok(U2(surface_desc).dwZBufferBitDepth == 32,
+ "Got unexpected dwZBufferBitDepth %u.\n", U2(surface_desc).dwZBufferBitDepth);
+ todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY),
+ "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps);
+ IDirectDrawSurface_Release(surface);
+
+ refcount = IDirectDraw2_Release(ddraw);
+ ok(!refcount, "%u references left.\n", refcount);
+ DestroyWindow(window);
+}
+
START_TEST(ddraw2)
{
DDDEVICEIDENTIFIER identifier;
@@ -13893,4 +13942,5 @@ START_TEST(ddraw2)
test_alphatest();
test_clipper_refcount();
test_caps();
+ test_d32_support();
}
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c
index 013d49c3658..b06e8db4f3a 100644
--- a/dlls/ddraw/tests/ddraw4.c
+++ b/dlls/ddraw/tests/ddraw4.c
@@ -16335,6 +16335,62 @@ static void test_caps(void)
IDirectDraw4_Release(ddraw);
}
+static void test_d32_support(void)
+{
+ IDirectDrawSurface4 *surface;
+ DDSURFACEDESC2 surface_desc;
+ IDirect3DDevice3 *device;
+ IDirectDraw4 *ddraw;
+ BOOL hw = FALSE;
+ 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(window, DDSCL_NORMAL)))
+ {
+ IDirect3DDevice3_Release(device);
+ hw = TRUE;
+ }
+
+ hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ memset(&surface_desc, 0, sizeof(surface_desc));
+ surface_desc.dwSize = sizeof(surface_desc);
+ surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT;
+ surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER;
+ U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat);
+ U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER;
+ U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth = 32;
+ U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask = 0xffffffff;
+ surface_desc.dwWidth = 64;
+ surface_desc.dwHeight = 64;
+ hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ memset(&surface_desc, 0, sizeof(surface_desc));
+ surface_desc.dwSize = sizeof(surface_desc);
+ hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &surface_desc);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ ok((surface_desc.dwFlags & DDSD_PIXELFORMAT), "Got unexpected flags %#x.\n", surface_desc.dwFlags);
+ ok(U4(surface_desc).ddpfPixelFormat.dwFlags & DDPF_ZBUFFER,
+ "Got unexpected format flags %#x.\n", U4(surface_desc).ddpfPixelFormat.dwFlags);
+ ok(U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth == 32,
+ "Got unexpected dwZBufferBitDepth %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth);
+ ok(U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask == 0xffffffff,
+ "Got unexpected Z mask 0x%08x.\n", U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask);
+ todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY),
+ "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps);
+ IDirectDrawSurface4_Release(surface);
+
+ refcount = IDirectDraw4_Release(ddraw);
+ ok(!refcount, "%u references left.\n", refcount);
+ DestroyWindow(window);
+}
+
START_TEST(ddraw4)
{
DDDEVICEIDENTIFIER identifier;
@@ -16468,4 +16524,5 @@ START_TEST(ddraw4)
test_alphatest();
test_clipper_refcount();
test_caps();
+ test_d32_support();
}
diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
index b0fc634eef7..137270e3c7a 100644
--- a/dlls/ddraw/tests/ddraw7.c
+++ b/dlls/ddraw/tests/ddraw7.c
@@ -16289,6 +16289,62 @@ static void test_caps(void)
IDirectDraw7_Release(ddraw);
}
+static void test_d32_support(void)
+{
+ IDirectDrawSurface7 *surface;
+ DDSURFACEDESC2 surface_desc;
+ IDirect3DDevice7 *device;
+ IDirectDraw7 *ddraw;
+ BOOL hw = FALSE;
+ 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(window, DDSCL_NORMAL)))
+ {
+ IDirect3DDevice7_Release(device);
+ hw = TRUE;
+ }
+
+ hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ memset(&surface_desc, 0, sizeof(surface_desc));
+ surface_desc.dwSize = sizeof(surface_desc);
+ surface_desc.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT;
+ surface_desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER;
+ U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat);
+ U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_ZBUFFER;
+ U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth = 32;
+ U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask = 0xffffffff;
+ surface_desc.dwWidth = 64;
+ surface_desc.dwHeight = 64;
+ hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+
+ memset(&surface_desc, 0, sizeof(surface_desc));
+ surface_desc.dwSize = sizeof(surface_desc);
+ hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc);
+ ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr);
+ ok((surface_desc.dwFlags & DDSD_PIXELFORMAT), "Got unexpected flags %#x.\n", surface_desc.dwFlags);
+ ok(U4(surface_desc).ddpfPixelFormat.dwFlags & DDPF_ZBUFFER,
+ "Got unexpected format flags %#x.\n", U4(surface_desc).ddpfPixelFormat.dwFlags);
+ ok(U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth == 32,
+ "Got unexpected dwZBufferBitDepth %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth);
+ ok(U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask == 0xffffffff,
+ "Got unexpected Z mask 0x%08x.\n", U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask);
+ todo_wine_if(hw) ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY),
+ "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps);
+ IDirectDrawSurface7_Release(surface);
+
+ refcount = IDirectDraw7_Release(ddraw);
+ ok(!refcount, "%u references left.\n", refcount);
+ DestroyWindow(window);
+}
+
START_TEST(ddraw7)
{
DDDEVICEIDENTIFIER2 identifier;
@@ -16436,4 +16492,5 @@ START_TEST(ddraw7)
test_clipper_refcount();
test_begin_end_state_block();
test_caps();
+ test_d32_support();
}
--
2.11.0
More information about the wine-devel
mailing list