Henri Verbeet : d3d10core/tests: Add some tests for copying between depth/stencil and colour formats.
Alexandre Julliard
julliard at winehq.org
Thu May 6 14:56:19 CDT 2021
Module: wine
Branch: master
Commit: dfb6c307541efb6144b720775728cd980023bbdf
URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfb6c307541efb6144b720775728cd980023bbdf
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu May 6 16:59:17 2021 +0200
d3d10core/tests: Add some tests for copying between depth/stencil and colour formats.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d10core/tests/d3d10core.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c
index d23857a14bf..def80870fd5 100644
--- a/dlls/d3d10core/tests/d3d10core.c
+++ b/dlls/d3d10core/tests/d3d10core.c
@@ -16112,6 +16112,8 @@ static void test_format_compatibility(void)
DXGI_FORMAT dst_format;
size_t texel_size;
BOOL success;
+ BOOL src_ds;
+ BOOL dst_ds;
}
test_data[] =
{
@@ -16140,6 +16142,10 @@ static void test_format_compatibility(void)
{DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE},
{DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE},
{DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_TYPELESS, 8, TRUE},
+ {DXGI_FORMAT_D16_UNORM, DXGI_FORMAT_R16_UNORM, 2, TRUE, TRUE},
+ {DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_D16_UNORM, 2, FALSE, FALSE, TRUE},
+ {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_TYPELESS, 2, TRUE, TRUE},
+ {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_TYPELESS, 2, FALSE, FALSE, TRUE},
};
static const DWORD initial_data[16] = {0};
static const DWORD bitmap_data[] =
@@ -16161,7 +16167,6 @@ static void test_format_compatibility(void)
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;
@@ -16172,7 +16177,8 @@ static void test_format_compatibility(void)
texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size);
texture_desc.Format = test_data[i].src_format;
- texture_desc.Usage = D3D10_USAGE_IMMUTABLE;
+ texture_desc.Usage = test_data[i].src_ds ? D3D10_USAGE_DEFAULT : D3D10_USAGE_IMMUTABLE;
+ texture_desc.BindFlags = test_data[i].src_ds ? D3D10_BIND_DEPTH_STENCIL : D3D10_BIND_SHADER_RESOURCE;
resource_data.pSysMem = bitmap_data;
resource_data.SysMemPitch = texture_desc.Width * test_data[i].texel_size;
@@ -16183,6 +16189,7 @@ static void test_format_compatibility(void)
texture_desc.Format = test_data[i].dst_format;
texture_desc.Usage = D3D10_USAGE_DEFAULT;
+ texture_desc.BindFlags = test_data[i].dst_ds ? D3D10_BIND_DEPTH_STENCIL : D3D10_BIND_SHADER_RESOURCE;
resource_data.pSysMem = initial_data;
@@ -16201,7 +16208,9 @@ 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)
+ /* While partial depth/stencil <-> colour copies are unsupported in
+ * d3d11, they're just broken in d3d10. */
+ for (j = 0; j < ARRAY_SIZE(bitmap_data) && !test_data[i].src_ds; ++j)
{
x = j % 4;
y = j / 4;
@@ -16222,8 +16231,9 @@ static void test_format_compatibility(void)
y = j / 4;
colour = get_readback_color(&rb, x, y);
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_ds)
+ 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);
More information about the wine-cvs
mailing list