From: Elizabeth Figura zfigura@codeweavers.com
Windows 98 NVidia and ATI drivers seem to support this. --- dlls/ddraw/tests/ddraw1.c | 2 -- dlls/ddraw/tests/ddraw2.c | 2 -- dlls/ddraw/tests/ddraw4.c | 2 -- dlls/ddraw/tests/ddraw7.c | 2 -- dlls/wined3d/utils.c | 2 +- 5 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 3292883afb3..9fd952cf55a 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -14425,8 +14425,6 @@ static void test_d32_support(void) ok((surface_desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags %#lx.\n", surface_desc.dwFlags); ok(surface_desc.dwZBufferBitDepth == 32, "Got unexpected dwZBufferBitDepth %lu.\n", surface_desc.dwZBufferBitDepth); - ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), - "Got unexpected surface caps %#lx.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface_Release(surface);
refcount = IDirectDraw_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 3c49c28a212..0431116d57c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -15446,8 +15446,6 @@ static void test_d32_support(void) ok((surface_desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags %#lx.\n", surface_desc.dwFlags); ok(surface_desc.dwZBufferBitDepth == 32, "Got unexpected dwZBufferBitDepth %lu.\n", surface_desc.dwZBufferBitDepth); - ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), - "Got unexpected surface caps %#lx.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface_Release(surface);
refcount = IDirectDraw2_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 064591ec4e6..683530c8e2d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -18180,8 +18180,6 @@ static void test_d32_support(void) "Got unexpected dwZBufferBitDepth %lu.\n", surface_desc.ddpfPixelFormat.dwZBufferBitDepth); ok(surface_desc.ddpfPixelFormat.dwZBitMask == 0xffffffff, "Got unexpected Z mask 0x%08lx.\n", surface_desc.ddpfPixelFormat.dwZBitMask); - ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), - "Got unexpected surface caps %#lx.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface4_Release(surface);
refcount = IDirectDraw4_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fae4f6ae9cc..547971a9368 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18318,8 +18318,6 @@ static void test_d32_support(void) "Got unexpected dwZBufferBitDepth %lu.\n", surface_desc.ddpfPixelFormat.dwZBufferBitDepth); ok(surface_desc.ddpfPixelFormat.dwZBitMask == 0xffffffff, "Got unexpected Z mask 0x%08lx.\n", surface_desc.ddpfPixelFormat.dwZBitMask); - ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), - "Got unexpected surface caps %#lx.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface7_Release(surface);
refcount = IDirectDraw7_Release(ddraw); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5c37dbba0e9..7ba67781e50 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1353,7 +1353,7 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers }
/* We intentionally don't support WINED3DFMT_D32_UNORM. No hardware driver - * supports it, and applications get confused when we do. + * supports it on d3d9, and applications get confused when we do. * * The following formats explicitly don't have WINED3D_FORMAT_CAP_TEXTURE set: *