From: Elizabeth Figura zfigura@codeweavers.com
d3d9 and d3d10 YUV formats generally have completely different behaviour, even after accounting for the fundamental differences between the APIs. d3d9 can blit between YUV and RGB formats, with associated format conversion, and can use the entire resource in blits and clears, whereas d3d10 cannot do either of these things, and must use views of individual planes.
This causes some friction given that we implement d3d9 APIs using views internally. In particular, 4caa93a369b51a9bd8922a3f2cdd02a632b52543 inadvertently breaks clears of d3d1-9 YUV surfaces.
The two formats have almost no actual functionality in common, so address this by using two different format enumerants.
Fixes: 4caa93a369b51a9bd8922a3f2cdd02a632b52543 --- dlls/d3d11/utils.c | 4 ++-- dlls/d3d9/tests/visual.c | 7 +++++++ dlls/dxgi/utils.c | 4 ++-- dlls/wined3d/utils.c | 4 +++- include/wine/wined3d.h | 1 + 5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 1a0be470f38..de5e08b8e7a 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -311,7 +311,7 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; - case WINED3DFMT_NV12: return DXGI_FORMAT_NV12; + case WINED3DFMT_NV12_PLANAR: return DXGI_FORMAT_NV12; case WINED3DFMT_YUY2: return DXGI_FORMAT_YUY2; case WINED3DFMT_B4G4R4A4_UNORM: return DXGI_FORMAT_B4G4R4A4_UNORM; default: @@ -424,7 +424,7 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; - case DXGI_FORMAT_NV12: return WINED3DFMT_NV12; + case DXGI_FORMAT_NV12: return WINED3DFMT_NV12_PLANAR; case DXGI_FORMAT_YUY2: return WINED3DFMT_YUY2; case DXGI_FORMAT_B4G4R4A4_UNORM: return WINED3DFMT_B4G4R4A4_UNORM; default: diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index bcf14631a8d..0c511f495b3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13919,6 +13919,13 @@ static void yuv_layout_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); } + + for (i = 0; i < ARRAY_SIZE(test_data); i++) + { + hr = IDirect3DDevice9_ColorFill(device, surface, NULL, test_data[i].color1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + } + IDirect3DSurface9_Release(surface); }
diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 6ae60a79f9a..8ab1ace3c43 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -263,7 +263,7 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; - case WINED3DFMT_NV12: return DXGI_FORMAT_NV12; + case WINED3DFMT_NV12_PLANAR: return DXGI_FORMAT_NV12; case WINED3DFMT_YUY2: return DXGI_FORMAT_YUY2; case WINED3DFMT_B4G4R4A4_UNORM: return DXGI_FORMAT_B4G4R4A4_UNORM; default: @@ -376,7 +376,7 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; - case DXGI_FORMAT_NV12: return WINED3DFMT_NV12; + case DXGI_FORMAT_NV12: return WINED3DFMT_NV12_PLANAR; case DXGI_FORMAT_YUY2: return WINED3DFMT_YUY2; case DXGI_FORMAT_B4G4R4A4_UNORM: return WINED3DFMT_B4G4R4A4_UNORM; default: diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e5969daa527..58ca1fcca5e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -89,6 +89,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_YUY2, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_YV12, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_NV12, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, + {WINED3DFMT_NV12_PLANAR, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_DXT1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_DXT2, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_DXT3, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, @@ -718,7 +719,7 @@ static const struct } format_plane_info[] = { - {WINED3DFMT_NV12, {WINED3DFMT_R8_UINT, WINED3DFMT_R8G8_UINT}, 2, 2}, + {WINED3DFMT_NV12_PLANAR, {WINED3DFMT_R8_UINT, WINED3DFMT_R8G8_UINT}, 2, 2}, };
struct wined3d_format_vertex_info @@ -4757,6 +4758,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_R9G9B9E5_SHAREDEXP); FMT_TO_STR(WINED3DFMT_R8G8_B8G8_UNORM); FMT_TO_STR(WINED3DFMT_G8R8_G8B8_UNORM); + FMT_TO_STR(WINED3DFMT_NV12_PLANAR); FMT_TO_STR(WINED3DFMT_BC1_TYPELESS); FMT_TO_STR(WINED3DFMT_BC1_UNORM); FMT_TO_STR(WINED3DFMT_BC1_UNORM_SRGB); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 871d61fcde3..85e12f8e621 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -224,6 +224,7 @@ enum wined3d_format_id WINED3DFMT_R9G9B9E5_SHAREDEXP, WINED3DFMT_R8G8_B8G8_UNORM, WINED3DFMT_G8R8_G8B8_UNORM, + WINED3DFMT_NV12_PLANAR, WINED3DFMT_BC1_TYPELESS, WINED3DFMT_BC1_UNORM, WINED3DFMT_BC1_UNORM_SRGB,