From c5577721b909f8c70d3723cae561e9594902df26 Mon Sep 17 00:00:00 2001 From: Jactry Zeng Date: Tue, 25 Jun 2019 02:29:45 +0430 Subject: [PATCH] wined3d: Drop support for WINED3DFMT_D32_UNORM. Signed-off-by: Jactry Zeng Signed-off-by: Henri Verbeet Signed-off-by: Alexandre Julliard --- dlls/d3d8/tests/device.c | 4 ++-- dlls/d3d9/tests/device.c | 4 ++-- dlls/ddraw/tests/ddraw1.c | 10 +--------- dlls/ddraw/tests/ddraw2.c | 10 +--------- dlls/ddraw/tests/ddraw4.c | 10 +--------- dlls/ddraw/tests/ddraw7.c | 10 +--------- dlls/wined3d/utils.c | 13 ++++--------- 7 files changed, 12 insertions(+), 49 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 03eb69554cf..1e7b9888b62 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -8263,12 +8263,12 @@ static void test_check_device_format(void) hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_D32); - todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), "Got unexpected hr %#x.\n", hr); hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, D3DFMT_D32); - todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), "Got unexpected hr %#x.\n", hr); IDirect3D8_Release(d3d); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c59b1f74bb5..f05aded3815 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11835,12 +11835,12 @@ static void test_check_device_format(void) hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_D32); - todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), "Got unexpected hr %#x.\n", hr); hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, D3DFMT_D32); - todo_wine ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), + ok(hr == D3DERR_NOTAVAILABLE || broken(hr == D3DERR_INVALIDCALL /* Windows 10 */), "Got unexpected hr %#x.\n", hr); IDirect3D9_Release(d3d); diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 7f5e697e7af..b28f1d7515f 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12903,9 +12903,7 @@ static void test_d32_support(void) { IDirectDrawSurface *surface; DDSURFACEDESC surface_desc; - IDirect3DDevice *device; IDirectDraw *ddraw; - BOOL hw = FALSE; ULONG refcount; HWND window; HRESULT hr; @@ -12913,12 +12911,6 @@ static void test_d32_support(void) 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); @@ -12939,7 +12931,7 @@ static void test_d32_support(void) 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), + ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface_Release(surface); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 75b848d1e28..f25cdd834c4 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13779,9 +13779,7 @@ static void test_d32_support(void) { IDirectDrawSurface *surface; DDSURFACEDESC surface_desc; - IDirect3DDevice2 *device; IDirectDraw2 *ddraw; - BOOL hw = FALSE; ULONG refcount; HWND window; HRESULT hr; @@ -13789,12 +13787,6 @@ static void test_d32_support(void) 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); @@ -13815,7 +13807,7 @@ static void test_d32_support(void) 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), + ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface_Release(surface); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b06e8db4f3a..bc58c1817c3 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -16339,9 +16339,7 @@ static void test_d32_support(void) { IDirectDrawSurface4 *surface; DDSURFACEDESC2 surface_desc; - IDirect3DDevice3 *device; IDirectDraw4 *ddraw; - BOOL hw = FALSE; ULONG refcount; HWND window; HRESULT hr; @@ -16349,12 +16347,6 @@ static void test_d32_support(void) 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); @@ -16382,7 +16374,7 @@ static void test_d32_support(void) "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), + ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface4_Release(surface); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 137270e3c7a..49aab667e55 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -16293,9 +16293,7 @@ static void test_d32_support(void) { IDirectDrawSurface7 *surface; DDSURFACEDESC2 surface_desc; - IDirect3DDevice7 *device; IDirectDraw7 *ddraw; - BOOL hw = FALSE; ULONG refcount; HWND window; HRESULT hr; @@ -16303,12 +16301,6 @@ static void test_d32_support(void) 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); @@ -16336,7 +16328,7 @@ static void test_d32_support(void) "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), + ok(!(surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY), "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps); IDirectDrawSurface7_Release(surface); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 44b6c48e677..0872b1007a4 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1270,7 +1270,10 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers return NULL; } -/* The following formats explicitly don't have WINED3DFMT_FLAG_TEXTURE set: +/* We intentionally don't support WINED3DFMT_D32_UNORM. No hardware driver + * supports it, and applications get confused when we do. + * + * The following formats explicitly don't have WINED3DFMT_FLAG_TEXTURE set: * * These are never supported on native. * WINED3DFMT_B8G8R8_UNORM @@ -1777,14 +1780,6 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, ARB_DEPTH_TEXTURE, NULL}, - {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, - WINED3DFMT_FLAG_DEPTH, - WINED3D_GL_EXT_NONE, NULL}, - {WINED3DFMT_D32_UNORM, GL_DEPTH_COMPONENT32_ARB, GL_DEPTH_COMPONENT32_ARB, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, - ARB_DEPTH_TEXTURE, NULL}, {WINED3DFMT_S1_UINT_D15_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT16, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW,