ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Drop support for WINED3DFMT_D32_UNORM. 

Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jactry Zeng 2019-06-25 02:29:45 +04:30 committed by Alexandre Julliard
parent db0dd15618
commit c5577721b9
7 changed files with 12 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/d3d8/tests/device.c
View File

@ -8263,12 +8263,12 @@ static void test_check_device_format(void)
hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT,
D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_D32); 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); "Got unexpected hr %#x.\n", hr);
hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT,
D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, D3DFMT_D32); 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); "Got unexpected hr %#x.\n", hr);
IDirect3D8_Release(d3d); IDirect3D8_Release(d3d);

4
dlls/d3d9/tests/device.c
View File

@ -11835,12 +11835,12 @@ static void test_check_device_format(void)
hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT,
D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, D3DFMT_D32); 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); "Got unexpected hr %#x.\n", hr);
hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT,
D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DFMT_R5G6B5, D3DFMT_D32); 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); "Got unexpected hr %#x.\n", hr);
IDirect3D9_Release(d3d); IDirect3D9_Release(d3d);

10
dlls/ddraw/tests/ddraw1.c
View File

@ -12903,9 +12903,7 @@ static void test_d32_support(void)
{ {
IDirectDrawSurface *surface; IDirectDrawSurface *surface;
DDSURFACEDESC surface_desc; DDSURFACEDESC surface_desc;
IDirect3DDevice *device;
IDirectDraw *ddraw; IDirectDraw *ddraw;
BOOL hw = FALSE;
ULONG refcount; ULONG refcount;
HWND window; HWND window;
HRESULT hr; HRESULT hr;
@ -12913,12 +12911,6 @@ static void test_d32_support(void)
window = create_window(); window = create_window();
ddraw = create_ddraw(); ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n"); 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); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); 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((surface_desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags %#x.\n", surface_desc.dwFlags);
ok(U2(surface_desc).dwZBufferBitDepth == 32, ok(U2(surface_desc).dwZBufferBitDepth == 32,
"Got unexpected dwZBufferBitDepth %u.\n", U2(surface_desc).dwZBufferBitDepth); "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); "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps);
IDirectDrawSurface_Release(surface); IDirectDrawSurface_Release(surface);

10
dlls/ddraw/tests/ddraw2.c
View File

@ -13779,9 +13779,7 @@ static void test_d32_support(void)
{ {
IDirectDrawSurface *surface; IDirectDrawSurface *surface;
DDSURFACEDESC surface_desc; DDSURFACEDESC surface_desc;
IDirect3DDevice2 *device;
IDirectDraw2 *ddraw; IDirectDraw2 *ddraw;
BOOL hw = FALSE;
ULONG refcount; ULONG refcount;
HWND window; HWND window;
HRESULT hr; HRESULT hr;
@ -13789,12 +13787,6 @@ static void test_d32_support(void)
window = create_window(); window = create_window();
ddraw = create_ddraw(); ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n"); 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); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); 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((surface_desc.dwFlags & DDSD_ZBUFFERBITDEPTH), "Got unexpected flags %#x.\n", surface_desc.dwFlags);
ok(U2(surface_desc).dwZBufferBitDepth == 32, ok(U2(surface_desc).dwZBufferBitDepth == 32,
"Got unexpected dwZBufferBitDepth %u.\n", U2(surface_desc).dwZBufferBitDepth); "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); "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps);
IDirectDrawSurface_Release(surface); IDirectDrawSurface_Release(surface);

10
dlls/ddraw/tests/ddraw4.c
View File

@ -16339,9 +16339,7 @@ static void test_d32_support(void)
{ {
IDirectDrawSurface4 *surface; IDirectDrawSurface4 *surface;
DDSURFACEDESC2 surface_desc; DDSURFACEDESC2 surface_desc;
IDirect3DDevice3 *device;
IDirectDraw4 *ddraw; IDirectDraw4 *ddraw;
BOOL hw = FALSE;
ULONG refcount; ULONG refcount;
HWND window; HWND window;
HRESULT hr; HRESULT hr;
@ -16349,12 +16347,6 @@ static void test_d32_support(void)
window = create_window(); window = create_window();
ddraw = create_ddraw(); ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n"); 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); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); 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); "Got unexpected dwZBufferBitDepth %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth);
ok(U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask == 0xffffffff, ok(U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask == 0xffffffff,
"Got unexpected Z mask 0x%08x.\n", U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask); "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); "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps);
IDirectDrawSurface4_Release(surface); IDirectDrawSurface4_Release(surface);

10
dlls/ddraw/tests/ddraw7.c
View File

@ -16293,9 +16293,7 @@ static void test_d32_support(void)
{ {
IDirectDrawSurface7 *surface; IDirectDrawSurface7 *surface;
DDSURFACEDESC2 surface_desc; DDSURFACEDESC2 surface_desc;
IDirect3DDevice7 *device;
IDirectDraw7 *ddraw; IDirectDraw7 *ddraw;
BOOL hw = FALSE;
ULONG refcount; ULONG refcount;
HWND window; HWND window;
HRESULT hr; HRESULT hr;
@ -16303,12 +16301,6 @@ static void test_d32_support(void)
window = create_window(); window = create_window();
ddraw = create_ddraw(); ddraw = create_ddraw();
ok(!!ddraw, "Failed to create a ddraw object.\n"); 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); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL);
ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); 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); "Got unexpected dwZBufferBitDepth %u.\n", U1(U4(surface_desc).ddpfPixelFormat).dwZBufferBitDepth);
ok(U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask == 0xffffffff, ok(U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask == 0xffffffff,
"Got unexpected Z mask 0x%08x.\n", U3(U4(surface_desc).ddpfPixelFormat).dwZBitMask); "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); "Got unexpected surface caps %#x.\n", surface_desc.ddsCaps.dwCaps);
IDirectDrawSurface7_Release(surface); IDirectDrawSurface7_Release(surface);

13
dlls/wined3d/utils.c
View File

@ -1270,7 +1270,10 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers
return NULL; 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. * These are never supported on native.
* WINED3DFMT_B8G8R8_UNORM * WINED3DFMT_B8G8R8_UNORM
@ -1777,14 +1780,6 @@ static const struct wined3d_format_texture_info format_texture_info[] =
GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0,
WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW,
ARB_DEPTH_TEXTURE, NULL}, 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, {WINED3DFMT_S1_UINT_D15_UNORM, GL_DEPTH_COMPONENT16, GL_DEPTH_COMPONENT16, 0,
GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, 0,
WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_SHADOW,