- Wine-Devel - list.winehq.org

[PATCH 7/8] wined3d: Compare resource sizes in blocks in wined3d_device_copy_resource().
by Henri Verbeet Feb. 10, 2021

Feb. 10, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 3 ++- dlls/wined3d/device.c | 30 ++++++++++++++++++++---------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 43bdec02c0d1..21543cd224c4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28205,7 +28205,8 @@ static void test_compressed_format_compatibility(const D3D_FEATURE_LEVEL feature expected = texture_data[k]; else expected = initial_data[k]; - todo_wine_if(supported) + todo_wine_if(supported && (dst_format->block_edge != 1 + || k >= src_format->block_size / (sizeof(colour)))) ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", src_format->id, dst_format->id, colour, k, expected); if (colour != expected) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 25ef0d1c0169..df0f9721e4ab 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4541,7 +4541,9 @@ static bool resources_format_compatible(const struct wined3d_resource *src_resou void CDECL wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource) { + unsigned int src_row_block_count, dst_row_block_count; struct wined3d_texture *dst_texture, *src_texture; + unsigned int src_row_count, dst_row_count; struct wined3d_box box; unsigned int i, j; @@ -4561,16 +4563,6 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } - if (src_resource->width != dst_resource->width - || src_resource->height != dst_resource->height - || src_resource->depth != dst_resource->depth) - { - WARN("Resource dimensions (%ux%ux%u / %ux%ux%u) don't match.\n", - dst_resource->width, dst_resource->height, dst_resource->depth, - src_resource->width, src_resource->height, src_resource->depth); - return; - } - if (!resources_format_compatible(src_resource, dst_resource)) { WARN("Resource formats %s and %s are incompatible.\n", @@ -4579,6 +4571,24 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } + src_row_block_count = (src_resource->width + (src_resource->format->block_width - 1)) + / src_resource->format->block_width; + dst_row_block_count = (dst_resource->width + (dst_resource->format->block_width - 1)) + / dst_resource->format->block_width; + src_row_count = (src_resource->height + (src_resource->format->block_height - 1)) + / src_resource->format->block_height; + dst_row_count = (dst_resource->height + (dst_resource->format->block_height - 1)) + / dst_resource->format->block_height; + + if (src_row_block_count != dst_row_block_count || src_row_count != dst_row_count + || src_resource->depth != dst_resource->depth) + { + WARN("Resource block dimensions (%ux%ux%u / %ux%ux%u) don't match.\n", + dst_row_block_count, dst_row_count, dst_resource->depth, + src_row_block_count, src_row_count, src_resource->depth); + return; + } + if (dst_resource->type == WINED3D_RTYPE_BUFFER) { wined3d_box_set(&box, 0, 0, src_resource->size, 1, 0, 1); -- 2.20.1

2 1

[PATCH 4/8] d3d10core/tests: Add format compatibility tests for compressed formats.
by Henri Verbeet Feb. 10, 2021

Feb. 10, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 205 +++++++++++++++++++++++++++++++ 1 file changed, 205 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 5edd2fc1fbb8..f21431b22434 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -16129,6 +16129,210 @@ static void test_format_compatibility(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_compressed_format_compatibility(void) +{ + const struct format_info *src_format, *dst_format; + unsigned int row_block_count, row_count, i, j, k; + ID3D10Texture2D *src_texture, *dst_texture; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + struct resource_readback rb; + unsigned int block_idx, y; + DWORD colour, expected; + ID3D10Device *device; + const BYTE *row; + ULONG refcount; + D3D10_BOX box; + HRESULT hr; + + static const struct format_info + { + DXGI_FORMAT id; + size_t block_size; + size_t block_edge; + } + formats[] = + { + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 16, 1}, + {DXGI_FORMAT_R32G32B32A32_FLOAT, 16, 1}, + {DXGI_FORMAT_R32G32B32A32_UINT, 16, 1}, + {DXGI_FORMAT_R32G32B32A32_SINT, 16, 1}, + + {DXGI_FORMAT_R16G16B16A16_TYPELESS, 8, 1}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, 8, 1}, + {DXGI_FORMAT_R16G16B16A16_UNORM, 8, 1}, + {DXGI_FORMAT_R16G16B16A16_UINT, 8, 1}, + {DXGI_FORMAT_R16G16B16A16_SNORM, 8, 1}, + {DXGI_FORMAT_R16G16B16A16_SINT, 8, 1}, + + {DXGI_FORMAT_R32G32_TYPELESS, 8, 1}, + {DXGI_FORMAT_R32G32_FLOAT, 8, 1}, + {DXGI_FORMAT_R32G32_UINT, 8, 1}, + {DXGI_FORMAT_R32G32_SINT, 8, 1}, + + {DXGI_FORMAT_R32_TYPELESS, 4, 1}, + {DXGI_FORMAT_R32_FLOAT, 4, 1}, + {DXGI_FORMAT_R32_UINT, 4, 1}, + {DXGI_FORMAT_R32_SINT, 4, 1}, + + {DXGI_FORMAT_R32G8X24_TYPELESS, 8, 1}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, 4, 1}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, 1}, + {DXGI_FORMAT_R16G16_TYPELESS, 4, 1}, + {DXGI_FORMAT_R24G8_TYPELESS, 4, 1}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 4, 1}, + {DXGI_FORMAT_R8G8_TYPELESS, 2, 1}, + {DXGI_FORMAT_R16_TYPELESS, 2, 1}, + {DXGI_FORMAT_R8_TYPELESS, 1, 1}, + + {DXGI_FORMAT_BC1_TYPELESS, 8, 4}, + {DXGI_FORMAT_BC1_UNORM, 8, 4}, + {DXGI_FORMAT_BC1_UNORM_SRGB, 8, 4}, + + {DXGI_FORMAT_BC2_TYPELESS, 16, 4}, + {DXGI_FORMAT_BC2_UNORM, 16, 4}, + {DXGI_FORMAT_BC2_UNORM_SRGB, 16, 4}, + + {DXGI_FORMAT_BC3_TYPELESS, 16, 4}, + {DXGI_FORMAT_BC3_UNORM, 16, 4}, + {DXGI_FORMAT_BC3_UNORM_SRGB, 16, 4}, + + {DXGI_FORMAT_BC4_TYPELESS, 8, 4}, + {DXGI_FORMAT_BC4_UNORM, 8, 4}, + {DXGI_FORMAT_BC4_SNORM, 8, 4}, + + {DXGI_FORMAT_BC5_TYPELESS, 16, 4}, + {DXGI_FORMAT_BC5_UNORM, 16, 4}, + {DXGI_FORMAT_BC5_SNORM, 16, 4}, + }; + + static const DWORD initial_data[64] = {0}; + static const DWORD texture_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + + 0xff00ff00, 0xffffff00, 0xff0000ff, 0xff00ffff, + 0xff000000, 0xff7f7f7f, 0xffff0000, 0xffff00ff, + 0xffffffff, 0xff000000, 0xffffffff, 0xffffffff, + 0xff000000, 0xff000000, 0xffffffff, 0xff000000, + + 0xff000000, 0xff000000, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xffffffff, 0xffffffff, + 0xff000000, 0xff7f7f7f, 0xffff0000, 0xffff00ff, + 0xff00ff00, 0xffffff00, 0xff0000ff, 0xff00ffff, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + row_block_count = 4; + + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.SysMemSlicePitch = 0; + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + src_format = &formats[i]; + row_count = sizeof(texture_data) / (row_block_count * src_format->block_size); + texture_desc.Width = row_block_count * src_format->block_edge; + texture_desc.Height = row_count * src_format->block_edge; + texture_desc.Format = src_format->id; + texture_desc.Usage = D3D10_USAGE_IMMUTABLE; + + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = row_block_count * src_format->block_size; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture); + ok(hr == S_OK, "Source format %#x: Got unexpected hr %#x.\n", src_format->id, hr); + + for (j = 0; j < ARRAY_SIZE(formats); ++j) + { + dst_format = &formats[j]; + + if ((src_format->block_edge == 1 && dst_format->block_edge == 1) + || (src_format->block_edge != 1 && dst_format->block_edge != 1)) + continue; + + row_count = sizeof(initial_data) / (row_block_count * dst_format->block_size); + texture_desc.Width = row_block_count * dst_format->block_edge; + texture_desc.Height = row_count * dst_format->block_edge; + texture_desc.Format = dst_format->id; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + + resource_data.pSysMem = initial_data; + resource_data.SysMemPitch = row_block_count * dst_format->block_size; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); + ok(hr == S_OK, "%#x -> %#x: Got unexpected hr %#x.\n", src_format->id, dst_format->id, hr); + + set_box(&box, 0, 0, 0, src_format->block_edge, src_format->block_edge, 1); + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, + dst_format->block_edge, dst_format->block_edge, 0, (ID3D10Resource *)src_texture, 0, &box); + get_texture_readback(dst_texture, 0, &rb); + for (k = 0; k < ARRAY_SIZE(texture_data); ++k) + { + block_idx = (k * sizeof(colour)) / dst_format->block_size; + y = block_idx / row_block_count; + + row = rb.map_desc.pData; + row += y * rb.map_desc.RowPitch; + colour = ((DWORD *)row)[k % ((row_block_count * dst_format->block_size) / sizeof(colour))]; + + expected = initial_data[k]; + ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", + src_format->id, dst_format->id, colour, k, expected); + if (colour != expected) + break; + } + release_resource_readback(&rb); + + ID3D10Device_CopyResource(device, (ID3D10Resource *)dst_texture, (ID3D10Resource *)src_texture); + get_texture_readback(dst_texture, 0, &rb); + for (k = 0; k < ARRAY_SIZE(texture_data); ++k) + { + block_idx = (k * sizeof(colour)) / dst_format->block_size; + y = block_idx / row_block_count; + + row = rb.map_desc.pData; + row += y * rb.map_desc.RowPitch; + colour = ((DWORD *)row)[k % ((row_block_count * dst_format->block_size) / sizeof(colour))]; + + expected = initial_data[k]; + ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", + src_format->id, dst_format->id, colour, k, expected); + if (colour != expected) + break; + } + release_resource_readback(&rb); + + ID3D10Texture2D_Release(dst_texture); + } + + ID3D10Texture2D_Release(src_texture); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void check_clip_distance(struct d3d10core_test_context *test_context, ID3D10Buffer *vb) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -18633,6 +18837,7 @@ START_TEST(d3d10core) queue_test(test_stream_output_resume); queue_test(test_depth_bias); queue_test(test_format_compatibility); + queue_test(test_compressed_format_compatibility); queue_test(test_clip_distance); queue_test(test_combined_clip_and_cull_distances); queue_test(test_generate_mips); -- 2.20.1

2 1

[PATCH 3/8] d3d11/tests: Add format compatibility tests for compressed formats.
by Henri Verbeet Feb. 10, 2021

Feb. 10, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 271 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 271 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ff734ba453c8..d1b09baa641f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27958,6 +27958,275 @@ static void test_format_compatibility(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_compressed_format_compatibility(const D3D_FEATURE_LEVEL feature_level) +{ + const struct format_info *src_format, *dst_format; + unsigned int row_block_count, row_count, i, j, k; + ID3D11Texture2D *src_texture, *dst_texture; + BOOL supported, broken_dst_offset = FALSE; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + unsigned int block_idx, x, y; + struct resource_readback rb; + DWORD colour, expected; + ID3D11Device *device; + UINT format_support; + const BYTE *row; + ULONG refcount; + D3D11_BOX box; + HRESULT hr; + const struct device_desc device_desc = + { + .feature_level = &feature_level, + }; + + static const struct format_info + { + DXGI_FORMAT id; + size_t block_size; + size_t block_edge; + BOOL supported; + BOOL skip_if_broken; + } + formats[] = + { + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 16, 1, TRUE}, + {DXGI_FORMAT_R32G32B32A32_FLOAT, 16, 1, TRUE}, + {DXGI_FORMAT_R32G32B32A32_UINT, 16, 1, TRUE}, + {DXGI_FORMAT_R32G32B32A32_SINT, 16, 1, TRUE}, + + {DXGI_FORMAT_R16G16B16A16_TYPELESS, 8, 1, TRUE}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, 8, 1, TRUE}, + {DXGI_FORMAT_R16G16B16A16_UNORM, 8, 1, TRUE}, + {DXGI_FORMAT_R16G16B16A16_UINT, 8, 1, TRUE}, + {DXGI_FORMAT_R16G16B16A16_SNORM, 8, 1, TRUE}, + {DXGI_FORMAT_R16G16B16A16_SINT, 8, 1, TRUE}, + + {DXGI_FORMAT_R32G32_TYPELESS, 8, 1, TRUE}, + {DXGI_FORMAT_R32G32_FLOAT, 8, 1, TRUE}, + {DXGI_FORMAT_R32G32_UINT, 8, 1, TRUE}, + {DXGI_FORMAT_R32G32_SINT, 8, 1, TRUE}, + + {DXGI_FORMAT_R32_TYPELESS, 4, 1, TRUE}, + {DXGI_FORMAT_R32_FLOAT, 4, 1, TRUE}, + {DXGI_FORMAT_R32_UINT, 4, 1, TRUE}, + {DXGI_FORMAT_R32_SINT, 4, 1, TRUE}, + + {DXGI_FORMAT_R32G8X24_TYPELESS, 8, 1}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, 4, 1}, + {DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, 1}, + {DXGI_FORMAT_R16G16_TYPELESS, 4, 1}, + {DXGI_FORMAT_R24G8_TYPELESS, 4, 1}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, 4, 1}, + {DXGI_FORMAT_B8G8R8A8_TYPELESS, 4, 1}, + {DXGI_FORMAT_R8G8_TYPELESS, 2, 1}, + {DXGI_FORMAT_R16_TYPELESS, 2, 1}, + {DXGI_FORMAT_R8_TYPELESS, 1, 1}, + + {DXGI_FORMAT_BC1_TYPELESS, 8, 4}, + {DXGI_FORMAT_BC1_UNORM, 8, 4}, + {DXGI_FORMAT_BC1_UNORM_SRGB, 8, 4}, + + {DXGI_FORMAT_BC2_TYPELESS, 16, 4}, + {DXGI_FORMAT_BC2_UNORM, 16, 4}, + {DXGI_FORMAT_BC2_UNORM_SRGB, 16, 4}, + + {DXGI_FORMAT_BC3_TYPELESS, 16, 4}, + {DXGI_FORMAT_BC3_UNORM, 16, 4}, + {DXGI_FORMAT_BC3_UNORM_SRGB, 16, 4}, + + {DXGI_FORMAT_BC4_TYPELESS, 8, 4}, + {DXGI_FORMAT_BC4_UNORM, 8, 4}, + {DXGI_FORMAT_BC4_SNORM, 8, 4}, + + {DXGI_FORMAT_BC5_TYPELESS, 16, 4}, + {DXGI_FORMAT_BC5_UNORM, 16, 4}, + {DXGI_FORMAT_BC5_SNORM, 16, 4}, + + {DXGI_FORMAT_BC6H_TYPELESS, 16, 4, FALSE, TRUE}, + {DXGI_FORMAT_BC6H_UF16, 16, 4, FALSE, TRUE}, + {DXGI_FORMAT_BC6H_SF16, 16, 4, FALSE, TRUE}, + + {DXGI_FORMAT_BC7_TYPELESS, 16, 4, FALSE, TRUE}, + {DXGI_FORMAT_BC7_UNORM, 16, 4, FALSE, TRUE}, + {DXGI_FORMAT_BC7_UNORM_SRGB, 16, 4, FALSE, TRUE}, + }; + + static const DWORD initial_data[64] = {0}; + static const DWORD texture_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + + 0xff00ff00, 0xffffff00, 0xff0000ff, 0xff00ffff, + 0xff000000, 0xff7f7f7f, 0xffff0000, 0xffff00ff, + 0xffffffff, 0xff000000, 0xffffffff, 0xffffffff, + 0xff000000, 0xff000000, 0xffffffff, 0xff000000, + + 0xff000000, 0xff000000, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xffffffff, 0xffffffff, + 0xff000000, 0xff7f7f7f, 0xffff0000, 0xffff00ff, + 0xff00ff00, 0xffffff00, 0xff0000ff, 0xff00ffff, + }; + + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device for feature level %#x.\n", feature_level); + return; + } + ID3D11Device_GetImmediateContext(device, &context); + + row_block_count = 4; + + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.SysMemSlicePitch = 0; + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + src_format = &formats[i]; + row_count = sizeof(texture_data) / (row_block_count * src_format->block_size); + texture_desc.Width = row_block_count * src_format->block_edge; + texture_desc.Height = row_count * src_format->block_edge; + texture_desc.Format = src_format->id; + texture_desc.Usage = D3D11_USAGE_IMMUTABLE; + + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = row_block_count * src_format->block_size; + + hr = ID3D11Device_CheckFormatSupport(device, src_format->id, &format_support); + if (hr == E_FAIL || !(format_support & D3D11_FORMAT_SUPPORT_TEXTURE2D)) + continue; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture); + ok(hr == S_OK, "Source format %#x: Got unexpected hr %#x.\n", src_format->id, hr); + + for (j = 0; j < ARRAY_SIZE(formats); ++j) + { + dst_format = &formats[j]; + + if ((src_format->block_edge == 1 && dst_format->block_edge == 1) + || (src_format->block_edge != 1 && dst_format->block_edge != 1)) + continue; + + hr = ID3D11Device_CheckFormatSupport(device, dst_format->id, &format_support); + if (hr == E_FAIL || !(format_support & D3D11_FORMAT_SUPPORT_TEXTURE2D)) + continue; + + supported = ((src_format->block_edge != 1 && dst_format->supported) + || (src_format->supported && dst_format->block_edge != 1)) + && src_format->block_size == dst_format->block_size + && feature_level >= D3D_FEATURE_LEVEL_10_1; + + /* These cause the device to be removed on some versions of Windows. */ + if (supported && broken_dst_offset && (src_format->skip_if_broken || dst_format->skip_if_broken)) + { + win_skip("Skipping %#x -> %#x tests because of broken destination offset.\n", + src_format->id, dst_format->id); + continue; + } + + row_count = sizeof(initial_data) / (row_block_count * dst_format->block_size); + texture_desc.Width = row_block_count * dst_format->block_edge; + texture_desc.Height = row_count * dst_format->block_edge; + texture_desc.Format = dst_format->id; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + + resource_data.pSysMem = initial_data; + resource_data.SysMemPitch = row_block_count * dst_format->block_size; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); + ok(hr == S_OK, "%#x -> %#x: Got unexpected hr %#x.\n", src_format->id, dst_format->id, hr); + + if (supported && broken_dst_offset) + { + win_skip("Skipping %#x -> %#x CopySubresourceRegion() test because of broken destination offset.\n", + src_format->id, dst_format->id); + } + else + { + set_box(&box, 0, 0, 0, src_format->block_edge, src_format->block_edge, 1); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, + dst_format->block_edge, dst_format->block_edge, 0, (ID3D11Resource *)src_texture, 0, &box); + get_texture_readback(dst_texture, 0, &rb); + colour = get_readback_color(&rb, 0, 0, 0); + if (supported && colour == texture_data[0]) + { + win_skip("Detected broken destination offset for %#x -> %#x copy.\n", + src_format->id, dst_format->id); + broken_dst_offset = TRUE; + } + for (k = 0; k < ARRAY_SIZE(texture_data) && (!supported || !broken_dst_offset); ++k) + { + block_idx = (k * sizeof(colour)) / dst_format->block_size; + x = block_idx % row_block_count; + y = block_idx / row_block_count; + + row = rb.map_desc.pData; + row += y * rb.map_desc.RowPitch; + colour = ((DWORD *)row)[k % ((row_block_count * dst_format->block_size) / sizeof(colour))]; + + if (supported && x == 1 && y == 1) + expected = texture_data[k - ((row_block_count + 1) * dst_format->block_size) / sizeof(colour)]; + else + expected = initial_data[k]; + todo_wine_if(supported && x == 1 && y == 1) + ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", + src_format->id, dst_format->id, colour, k, expected); + if (colour != expected) + break; + } + release_resource_readback(&rb); + } + + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)dst_texture, (ID3D11Resource *)src_texture); + get_texture_readback(dst_texture, 0, &rb); + for (k = 0; k < ARRAY_SIZE(texture_data); ++k) + { + block_idx = (k * sizeof(colour)) / dst_format->block_size; + y = block_idx / row_block_count; + + row = rb.map_desc.pData; + row += y * rb.map_desc.RowPitch; + colour = ((DWORD *)row)[k % ((row_block_count * dst_format->block_size) / sizeof(colour))]; + + if (supported) + expected = texture_data[k]; + else + expected = initial_data[k]; + todo_wine_if(supported) + ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", + src_format->id, dst_format->id, colour, k, expected); + if (colour != expected) + break; + } + release_resource_readback(&rb); + + ID3D11Texture2D_Release(dst_texture); + } + + ID3D11Texture2D_Release(src_texture); + } + + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void check_clip_distance(struct d3d11_test_context *test_context, ID3D11Buffer *vb) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -31918,6 +32187,8 @@ START_TEST(d3d11) queue_test(test_early_depth_stencil); queue_test(test_conservative_depth_output); queue_test(test_format_compatibility); + queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_10_0, D3D_FEATURE_LEVEL_11_0, + test_compressed_format_compatibility); queue_test(test_clip_distance); queue_test(test_combined_clip_and_cull_distances); queue_test(test_generate_mips); -- 2.20.1

2 1

[tools] testbot/LogUtils: Add support for winedbg's unhandled exception lines.
by Francois Gouget Feb. 10, 2021

Feb. 10, 2021

They replace the test framework's "unhandled exception" lines we get on Windows but specify neither the test unit nor the process pid. So just assign them to the current test unit. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50538 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- For the following wtbsuite tests: WTBS Simple test crash (serialui:confdlg). WTBS Crash in a child process (kernel32:toolhelp). testbot/lib/WineTestBot/LogUtils.pm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 69299da66..9164b47ff 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -631,6 +631,13 @@ sub ParseWineTestReport($$$) _CheckUnit($LogInfo, $Cur, $Unit, "unhandled exception"); $Cur->{LineFailures}++; } + elsif ($Line =~ /Unhandled exception: .* in .* code /) + { + # This also replaces a test summary line. The pid is unknown so use 0. + $Cur->{Pids}->{0} = 1; + $Cur->{SummaryFailures}++; + $Cur->{LineFailures}++; + } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE}):\d+: unhandled exception [0-9a-fA-F]{8} in child process /) or $Line =~ /^([_.a-z0-9]+):\d+: unhandled exception [0-9a-fA-F]{8} in child process /) -- 2.20.1

1 0

[tools] testbot/reporttest: Add a test for winedbg's unhandled exception lines.
by Francois Gouget Feb. 10, 2021

Feb. 10, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- We get these when running the tests in Wine. testbot/src/reporttest/report.template | 9 +++++++-- testbot/src/reporttest/report.testwtbs | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/testbot/src/reporttest/report.template b/testbot/src/reporttest/report.template index 14d2cf6b7..8ff6e1466 100644 --- a/testbot/src/reporttest/report.template +++ b/testbot/src/reporttest/report.template @@ -314,7 +314,7 @@ advpack:files:0880 done (3) in 0s advpack:install start dlls/advpack/tests/install.c - ----- WTBS Simple test crash ------ A test unit with a crash +----- 1/2: A test unit with a wine/test.h "unhandled exception" line ----- Expected assessement: Crash 07b0:install: unhandled exception c0000005 at 0040167C advpack:install:07b0 done (-1073741819) in 0s @@ -515,7 +515,12 @@ Do not cut 07b0:syslink: 2251 tests executed (1 marked as todo, 2 failures), 1 s me off comctl32:syslink:07b0 done (2) in 0s -stub comctl32:tab +comctl32:tab start dlls/comctl32/tests/tab.c - +----- WTBS Simple test crash +----- 2/2: A test unit with a winedbg "unhandled exception" line +----- Expected assessement: Crash +Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). +comctl32:tab:07b0 done (-1073741819) in 0s stub comctl32:taskdialog diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 49ef2c0f5..b444b6931 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -13,7 +13,7 @@ with: ----- TestWTBS ----- -p tests.TestFailures 40 +p tests.TestFailures 41 p build.HasTask 0 a wine.log.GrepV ^Applying patch @@ -41,6 +41,7 @@ n 0 1234:rebar: unhandled exception c0000005 at 0040167C n 0 1234:subclass: unhandled exception c0000005 at 0040167C n 0 Do not cut syslink.c:40: Test failed: Something wrong n 0 Do not cut syslink.c:41: Test succeeded inside todo block: Something right! +n 0 Unhandled exception: page fault on write access to 0x00000000 in 32-bit code (0x0054376d). n 0 driver.c:40: Test failed: Something wrong n 0 driver.c:41: Test succeeded inside todo block: Something right! -- 2.20.1

1 0

[PATCH 1/8] d3d11/tests: Add format compatibility tests for DXGI_FORMAT_R9G9B9E5_SHAREDEXP.
by Henri Verbeet Feb. 10, 2021

Feb. 10, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a1a215858a2c..ff734ba453c8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27846,6 +27846,13 @@ static void test_format_compatibility(void) {DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_SINT, 4, TRUE}, {DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_TYPELESS, 4, TRUE}, {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_FLOAT, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_UINT, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_SINT, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_B8G8R8A8_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R16G16_TYPELESS, 4, FALSE}, {DXGI_FORMAT_R32G32_TYPELESS, DXGI_FORMAT_R32G32_FLOAT, 8, TRUE}, {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, @@ -27879,6 +27886,7 @@ static void test_format_compatibility(void) for (i = 0; i < ARRAY_SIZE(test_data); ++i) { unsigned int x, y, texel_dwords; + BOOL broken = FALSE; D3D11_BOX box; texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); @@ -27906,15 +27914,23 @@ static void test_format_compatibility(void) texel_dwords = test_data[i].texel_size / sizeof(DWORD); get_texture_readback(dst_texture, 0, &rb); - for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + colour = get_readback_color(&rb, 0, 0, 0); + if (test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && colour == bitmap_data[0]) + { + win_skip("Broken destination offset for %#x -> %#x copy.\n", + test_data[i].src_format, test_data[i].dst_format); + broken = TRUE; + } + for (j = 0; j < ARRAY_SIZE(bitmap_data) && !broken; ++j) { x = j % 4; y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success && x >= texel_dwords && y ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && expected) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); @@ -27927,8 +27943,9 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && expected) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); -- 2.20.1

2 1

[PATCH 6/8] wined3d: Use the format block dimensions to construct the destination box for sub-resource region copies.
by Henri Verbeet Feb. 9, 2021

Feb. 9, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 5 ++--- dlls/wined3d/device.c | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b690f94af926..43bdec02c0d1 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28182,9 +28182,8 @@ static void test_compressed_format_compatibility(const D3D_FEATURE_LEVEL feature expected = texture_data[k - ((row_block_count + 1) * dst_format->block_size) / sizeof(colour)]; else expected = initial_data[k]; - todo_wine_if(supported && x == 1 && y == 1) - ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", - src_format->id, dst_format->id, colour, k, expected); + ok(colour == expected, "%#x -> %#x: Got unexpected colour 0x%08x at %u, expected 0x%08x.\n", + src_format->id, dst_format->id, colour, k, expected); if (colour != expected) break; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ac8d5d78b61d..25ef0d1c0169 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4694,6 +4694,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev struct wined3d_texture *dst_texture = texture_from_resource(dst_resource); struct wined3d_texture *src_texture = texture_from_resource(src_resource); unsigned int src_level = src_sub_resource_idx % src_texture->level_count; + unsigned int src_row_block_count, src_row_count; if (dst_sub_resource_idx >= dst_texture->level_count * dst_texture->layer_count) { @@ -4741,8 +4742,23 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } - wined3d_box_set(&dst_box, dst_x, dst_y, dst_x + (src_box->right - src_box->left), - dst_y + (src_box->bottom - src_box->top), dst_z, dst_z + (src_box->back - src_box->front)); + if (src_resource->format->block_width == dst_resource->format->block_width + && src_resource->format->block_height == dst_resource->format->block_height) + { + wined3d_box_set(&dst_box, dst_x, dst_y, dst_x + (src_box->right - src_box->left), + dst_y + (src_box->bottom - src_box->top), dst_z, dst_z + (src_box->back - src_box->front)); + } + else + { + src_row_block_count = (src_box->right - src_box->left + src_resource->format->block_width - 1) + / src_resource->format->block_width; + src_row_count = (src_box->bottom - src_box->top + src_resource->format->block_height - 1) + / src_resource->format->block_height; + wined3d_box_set(&dst_box, dst_x, dst_y, + dst_x + (src_row_block_count * dst_resource->format->block_width), + dst_y + (src_row_count * dst_resource->format->block_height), + dst_z, dst_z + (src_box->back - src_box->front)); + } if (FAILED(wined3d_texture_check_box_dimensions(dst_texture, dst_sub_resource_idx % dst_texture->level_count, &dst_box))) { -- 2.20.1

1 0

[PATCH 5/8] wined3d: Allow resource copies between block-compatible formats.
by Henri Verbeet Feb. 9, 2021

Feb. 9, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 10 ++-- dlls/wined3d/device.c | 24 ++++++++-- dlls/wined3d/utils.c | 83 +++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 76 insertions(+), 42 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d1b09baa641f..b690f94af926 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -27928,9 +27928,8 @@ static void test_format_compatibility(void) colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success && x >= texel_dwords && y ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; - todo_wine_if(test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && expected) - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); @@ -27943,9 +27942,8 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - todo_wine_if(test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && expected) - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index feaef2ef18f4..ac8d5d78b61d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4520,6 +4520,24 @@ void CDECL wined3d_device_copy_uav_counter(struct wined3d_device *device, wined3d_cs_emit_copy_uav_counter(device->cs, dst_buffer, offset, uav); } +static bool resources_format_compatible(const struct wined3d_resource *src_resource, + const struct wined3d_resource *dst_resource) +{ + if (src_resource->format->id == dst_resource->format->id) + return true; + if (src_resource->format->typeless_id && src_resource->format->typeless_id == dst_resource->format->typeless_id) + return true; + if (src_resource->device->feature_level < WINED3D_FEATURE_LEVEL_10_1) + return false; + if ((src_resource->format_flags & WINED3DFMT_FLAG_BLOCKS) + && (dst_resource->format_flags & WINED3DFMT_FLAG_CAST_TO_BLOCK)) + return src_resource->format->block_byte_count == dst_resource->format->byte_count; + if ((src_resource->format_flags & WINED3DFMT_FLAG_CAST_TO_BLOCK) + && (dst_resource->format_flags & WINED3DFMT_FLAG_BLOCKS)) + return src_resource->format->byte_count == dst_resource->format->block_byte_count; + return false; +} + void CDECL wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource) { @@ -4553,8 +4571,7 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } - if (src_resource->format->typeless_id != dst_resource->format->typeless_id - || (!src_resource->format->typeless_id && src_resource->format->id != dst_resource->format->id)) + if (!resources_format_compatible(src_resource, dst_resource)) { WARN("Resource formats %s and %s are incompatible.\n", debug_d3dformat(dst_resource->format->id), @@ -4616,8 +4633,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } - if (src_resource->format->typeless_id != dst_resource->format->typeless_id - || (!src_resource->format->typeless_id && src_resource->format->id != dst_resource->format->id)) + if (!resources_format_compatible(src_resource, dst_resource)) { WARN("Resource formats %s and %s are incompatible.\n", debug_d3dformat(dst_resource->format->id), diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index daf079f50dcf..6839065365f8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -330,19 +330,37 @@ struct wined3d_format_base_flags * resource size. */ static const struct wined3d_format_base_flags format_base_flags[] = { - {WINED3DFMT_ATI1N, WINED3DFMT_FLAG_MAPPABLE | WINED3DFMT_FLAG_BROKEN_PITCH}, - {WINED3DFMT_ATI2N, WINED3DFMT_FLAG_MAPPABLE | WINED3DFMT_FLAG_BROKEN_PITCH}, - {WINED3DFMT_D16_LOCKABLE, WINED3DFMT_FLAG_MAPPABLE}, - {WINED3DFMT_INTZ, WINED3DFMT_FLAG_MAPPABLE}, - {WINED3DFMT_R11G11B10_FLOAT, WINED3DFMT_FLAG_FLOAT}, - {WINED3DFMT_D32_FLOAT, WINED3DFMT_FLAG_FLOAT}, - {WINED3DFMT_S8_UINT_D24_FLOAT, WINED3DFMT_FLAG_FLOAT}, - {WINED3DFMT_D32_FLOAT_S8X24_UINT, WINED3DFMT_FLAG_FLOAT}, - {WINED3DFMT_INST, WINED3DFMT_FLAG_EXTENSION}, - {WINED3DFMT_NULL, WINED3DFMT_FLAG_EXTENSION}, - {WINED3DFMT_NVDB, WINED3DFMT_FLAG_EXTENSION}, - {WINED3DFMT_ATOC, WINED3DFMT_FLAG_EXTENSION}, - {WINED3DFMT_RESZ, WINED3DFMT_FLAG_EXTENSION}, + {WINED3DFMT_ATI1N, WINED3DFMT_FLAG_MAPPABLE | WINED3DFMT_FLAG_BROKEN_PITCH}, + {WINED3DFMT_ATI2N, WINED3DFMT_FLAG_MAPPABLE | WINED3DFMT_FLAG_BROKEN_PITCH}, + {WINED3DFMT_D16_LOCKABLE, WINED3DFMT_FLAG_MAPPABLE}, + {WINED3DFMT_INTZ, WINED3DFMT_FLAG_MAPPABLE}, + {WINED3DFMT_R11G11B10_FLOAT, WINED3DFMT_FLAG_FLOAT}, + {WINED3DFMT_D32_FLOAT, WINED3DFMT_FLAG_FLOAT}, + {WINED3DFMT_S8_UINT_D24_FLOAT, WINED3DFMT_FLAG_FLOAT}, + {WINED3DFMT_D32_FLOAT_S8X24_UINT, WINED3DFMT_FLAG_FLOAT}, + {WINED3DFMT_INST, WINED3DFMT_FLAG_EXTENSION}, + {WINED3DFMT_NULL, WINED3DFMT_FLAG_EXTENSION}, + {WINED3DFMT_NVDB, WINED3DFMT_FLAG_EXTENSION}, + {WINED3DFMT_ATOC, WINED3DFMT_FLAG_EXTENSION}, + {WINED3DFMT_RESZ, WINED3DFMT_FLAG_EXTENSION}, + {WINED3DFMT_R32G32B32A32_TYPELESS, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32B32A32_FLOAT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32B32A32_UINT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32B32A32_SINT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_TYPELESS, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_FLOAT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_UNORM, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_UINT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_SNORM, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R16G16B16A16_SINT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_TYPELESS, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_FLOAT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_UINT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R32G32_SINT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R32_TYPELESS, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R32_FLOAT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R32_UINT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, + {WINED3DFMT_R32_SINT, WINED3DFMT_FLAG_CAST_TO_BLOCK}, }; static void rgb888_from_rgb565(WORD rgb565, BYTE *r, BYTE *g, BYTE *b) @@ -580,25 +598,26 @@ struct wined3d_format_block_info static const struct wined3d_format_block_info format_block_info[] = { - {WINED3DFMT_DXT1, 4, 4, 8, WINED3DFMT_FLAG_COMPRESSED}, - {WINED3DFMT_DXT2, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, - {WINED3DFMT_DXT3, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, - {WINED3DFMT_DXT4, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, - {WINED3DFMT_DXT5, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, - {WINED3DFMT_BC1_UNORM, 4, 4, 8, WINED3DFMT_FLAG_COMPRESSED}, - {WINED3DFMT_BC2_UNORM, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, - {WINED3DFMT_BC3_UNORM, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, - {WINED3DFMT_BC4_UNORM, 4, 4, 8, WINED3DFMT_FLAG_COMPRESSED}, - {WINED3DFMT_BC4_SNORM, 4, 4, 8, WINED3DFMT_FLAG_COMPRESSED}, - {WINED3DFMT_BC5_UNORM, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, - {WINED3DFMT_BC5_SNORM, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, - {WINED3DFMT_BC6H_UF16, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, - {WINED3DFMT_BC6H_SF16, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, - {WINED3DFMT_BC7_UNORM, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, - {WINED3DFMT_ATI1N, 4, 4, 8, WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_BLOCKS_NO_VERIFY}, - {WINED3DFMT_ATI2N, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_BLOCKS_NO_VERIFY}, - {WINED3DFMT_YUY2, 2, 1, 4, WINED3DFMT_FLAG_BLOCKS_NO_VERIFY}, - {WINED3DFMT_UYVY, 2, 1, 4, WINED3DFMT_FLAG_BLOCKS_NO_VERIFY}, + {WINED3DFMT_DXT1, 4, 4, 8, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_DXT2, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_DXT3, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_DXT4, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_DXT5, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC1_UNORM, 4, 4, 8, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC2_UNORM, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC3_UNORM, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC4_UNORM, 4, 4, 8, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC4_SNORM, 4, 4, 8, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC5_UNORM, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC5_SNORM, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC6H_UF16, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC6H_SF16, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_BC7_UNORM, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED}, + {WINED3DFMT_ATI1N, 4, 4, 8, WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_BLOCKS_NO_VERIFY}, + {WINED3DFMT_ATI2N, 4, 4, 16, WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_BLOCKS_NO_VERIFY}, + {WINED3DFMT_YUY2, 2, 1, 4, WINED3DFMT_FLAG_BLOCKS_NO_VERIFY}, + {WINED3DFMT_UYVY, 2, 1, 4, WINED3DFMT_FLAG_BLOCKS_NO_VERIFY}, + {WINED3DFMT_R9G9B9E5_SHAREDEXP, 1, 1, 4}, }; struct wined3d_format_vertex_info diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb68b780c7d6..2a75ab5d43d9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5713,6 +5713,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_VERTEX_ATTRIBUTE 0x01000000 #define WINED3DFMT_FLAG_BLIT 0x02000000 #define WINED3DFMT_FLAG_MAPPABLE 0x04000000 +#define WINED3DFMT_FLAG_CAST_TO_BLOCK 0x08000000 struct wined3d_rational { -- 2.20.1

1 0

[PATCH 2/8] d3d10core/tests: Add format compatibility tests for DXGI_FORMAT_R9G9B9E5_SHAREDEXP.
by Henri Verbeet Feb. 9, 2021

Feb. 9, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 9e116729e829..5edd2fc1fbb8 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -16024,6 +16024,12 @@ static void test_format_compatibility(void) {DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_SINT, 4, TRUE}, {DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_TYPELESS, 4, TRUE}, {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_FLOAT, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_UINT, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_SINT, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R16G16_TYPELESS, 4, FALSE}, {DXGI_FORMAT_R32G32_TYPELESS, DXGI_FORMAT_R32G32_FLOAT, 8, TRUE}, {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, -- 2.20.1

1 0

[PATCH 1/7] winegstreamer: Handle MPEG-1 audio formats in amt_to_wg_format().
by Zebediah Figura Feb. 9, 2021

Feb. 9, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 57 +++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 82801900a15..0389edc4c13 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -686,6 +686,57 @@ static bool amt_to_wg_format_audio(const AM_MEDIA_TYPE *mt, struct wg_format *fo return false; } +static bool amt_to_wg_format_audio_mpeg1(const AM_MEDIA_TYPE *mt, struct wg_format *format) +{ + const MPEG1WAVEFORMAT *audio_format = (const MPEG1WAVEFORMAT *)mt->pbFormat; + + if (!IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx)) + { + FIXME("Unknown format type %s.\n", debugstr_guid(&mt->formattype)); + return false; + } + if (mt->cbFormat < sizeof(*audio_format) || !mt->pbFormat) + { + ERR("Unexpected format size %u.\n", mt->cbFormat); + return false; + } + + format->major_type = WG_MAJOR_TYPE_AUDIO; + format->u.audio.channels = audio_format->wfx.nChannels; + format->u.audio.rate = audio_format->wfx.nSamplesPerSec; + if (audio_format->fwHeadLayer == 1) + format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER1; + else if (audio_format->fwHeadLayer == 2) + format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER2; + else if (audio_format->fwHeadLayer == 3) + format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER3; + else + return false; + return true; +} + +static bool amt_to_wg_format_audio_mpeg1_layer3(const AM_MEDIA_TYPE *mt, struct wg_format *format) +{ + const MPEGLAYER3WAVEFORMAT *audio_format = (const MPEGLAYER3WAVEFORMAT *)mt->pbFormat; + + if (!IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx)) + { + FIXME("Unknown format type %s.\n", debugstr_guid(&mt->formattype)); + return false; + } + if (mt->cbFormat < sizeof(*audio_format) || !mt->pbFormat) + { + ERR("Unexpected format size %u.\n", mt->cbFormat); + return false; + } + + format->major_type = WG_MAJOR_TYPE_AUDIO; + format->u.audio.channels = audio_format->wfx.nChannels; + format->u.audio.rate = audio_format->wfx.nSamplesPerSec; + format->u.audio.format = WG_AUDIO_FORMAT_MPEG1_LAYER3; + return true; +} + static bool amt_to_wg_format_video(const AM_MEDIA_TYPE *mt, struct wg_format *format) { static const struct @@ -750,7 +801,13 @@ static bool amt_to_wg_format(const AM_MEDIA_TYPE *mt, struct wg_format *format) if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Video)) return amt_to_wg_format_video(mt, format); if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio)) + { + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MPEG1AudioPayload)) + return amt_to_wg_format_audio_mpeg1(mt, format); + if (IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_MP3)) + return amt_to_wg_format_audio_mpeg1_layer3(mt, format); return amt_to_wg_format_audio(mt, format); + } FIXME("Unknown major type %s.\n", debugstr_guid(&mt->majortype)); return false; -- 2.30.0

1 6