April 2016 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11/tests: Test creating 2D array textures.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: b1ba91b227e0866db7f7d01a0999729e581a3f3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ba91b227e0866db7f7d01a0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:39 2016 +0200 d3d11/tests: Test creating 2D array textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 98 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 70 insertions(+), 28 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 30bda07..33c26d4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -818,6 +818,7 @@ static void test_create_texture2d(void) { ULONG refcount, expected_refcount; D3D11_SUBRESOURCE_DATA data = {0}; + D3D_FEATURE_LEVEL feature_level; ID3D11Device *device, *tmp; D3D11_TEXTURE2D_DESC desc; ID3D11Texture2D *texture; @@ -829,45 +830,73 @@ static void test_create_texture2d(void) static const struct { DXGI_FORMAT format; + UINT array_size; D3D11_BIND_FLAG bind_flags; + UINT misc_flags; BOOL succeeds; BOOL todo; } tests[] = { - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_VERTEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_INDEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_CONSTANT_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_RENDER_TARGET, TRUE, FALSE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, - {DXGI_FORMAT_R32G32B32_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D11_BIND_RENDER_TARGET, TRUE, FALSE}, - {DXGI_FORMAT_R32G32_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R32G8X24_TYPELESS, D3D11_BIND_DEPTH_STENCIL, TRUE, TRUE}, - {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D11_BIND_RENDER_TARGET, TRUE, FALSE}, - {DXGI_FORMAT_R32_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R24G8_TYPELESS, D3D11_BIND_VERTEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R24G8_TYPELESS, D3D11_BIND_INDEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R24G8_TYPELESS, D3D11_BIND_CONSTANT_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R24G8_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R24G8_TYPELESS, D3D11_BIND_DEPTH_STENCIL, TRUE, FALSE}, - {DXGI_FORMAT_R8G8_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R16_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R8_TYPELESS, D3D11_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, - {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, - {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D11_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D11_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D11_BIND_CONSTANT_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 0, D3D11_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 2, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 3, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 3, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 5, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 6, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, + TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 7, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, + TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 10, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, + TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 12, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, + TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 0, D3D11_BIND_RENDER_TARGET, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 2, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 9, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, + {DXGI_FORMAT_R32G32B32_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G8X24_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 0, D3D11_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 9, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 9, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, + TRUE, FALSE}, + {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_CONSTANT_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE}, }; if (!(device = create_device(NULL))) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } + feature_level = ID3D11Device_GetFeatureLevel(device); + desc.Width = 512; desc.Height = 512; desc.MipLevels = 1; @@ -963,12 +992,25 @@ static void test_create_texture2d(void) desc.SampleDesc.Count = 1; for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { + HRESULT expected_hr = tests[i].succeeds ? S_OK : E_INVALIDARG; + BOOL todo = tests[i].todo; + + if (feature_level < D3D_FEATURE_LEVEL_10_1 + && (tests[i].misc_flags & D3D11_RESOURCE_MISC_TEXTURECUBE) + && tests[i].array_size > 6) + { + expected_hr = E_INVALIDARG; + todo = TRUE; + } + + desc.ArraySize = tests[i].array_size; desc.Format = tests[i].format; desc.BindFlags = tests[i].bind_flags; + desc.MiscFlags = tests[i].misc_flags; hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, (ID3D11Texture2D **)&texture); - todo_wine_if(tests[i].todo) - ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(todo) + ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); if (SUCCEEDED(hr)) ID3D11Texture2D_Release(texture);

1 0

Józef Kucia : d3d10core/tests: Test creating 2D array textures.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: a0d54ccf619a6ec7ac21773014c5781c26e83043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0d54ccf619a6ec7ac2177301… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:38 2016 +0200 d3d10core/tests: Test creating 2D array textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 78 +++++++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 13df12b..f9a17f4 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -562,37 +562,63 @@ static void test_create_texture2d(void) static const struct { DXGI_FORMAT format; + UINT array_size; D3D10_BIND_FLAG bind_flags; + UINT misc_flags; BOOL succeeds; BOOL todo; } tests[] = { - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_VERTEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_INDEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_CONSTANT_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_RENDER_TARGET, TRUE, FALSE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_DEPTH_STENCIL, FALSE, FALSE}, - {DXGI_FORMAT_R32G32B32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_RENDER_TARGET, TRUE, FALSE}, - {DXGI_FORMAT_R32G32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R32G8X24_TYPELESS, D3D10_BIND_DEPTH_STENCIL, TRUE, TRUE}, - {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D10_BIND_RENDER_TARGET, TRUE, FALSE}, - {DXGI_FORMAT_R32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_VERTEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_INDEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_CONSTANT_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_DEPTH_STENCIL, TRUE, FALSE}, - {DXGI_FORMAT_R8G8_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R8_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, - {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, - {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_CONSTANT_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 0, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 2, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 3, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 3, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 5, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 6, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 7, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 10, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 12, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 0, D3D10_BIND_RENDER_TARGET, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 2, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 9, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, + {DXGI_FORMAT_R32G32B32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G8X24_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 0, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_CONSTANT_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, }; if (!(device = create_device())) @@ -698,8 +724,10 @@ static void test_create_texture2d(void) desc.SampleDesc.Count = 1; for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { + desc.ArraySize = tests[i].array_size; desc.Format = tests[i].format; desc.BindFlags = tests[i].bind_flags; + desc.MiscFlags = tests[i].misc_flags; hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, (ID3D10Texture2D **)&texture); todo_wine_if(tests[i].todo)

1 0

Józef Kucia : d3d11/tests: Add more tests for texture data initialization.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: 9b6430927a8a8a508973bf97d23d7d3c57eb2132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6430927a8a8a508973bf97d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:37 2016 +0200 d3d11/tests: Add more tests for texture data initialization. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 72 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 58 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f758583..30bda07 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5262,13 +5262,13 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_multisample_init(void) +static void test_texture_data_init(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; struct d3d11_test_context test_context; ID3D11DeviceContext *context; D3D11_TEXTURE2D_DESC desc; - ID3D11Texture2D *multi; + ID3D11Texture2D *texture; ID3D11Device *device; UINT count = 0; HRESULT hr; @@ -5279,37 +5279,81 @@ static void test_multisample_init(void) device = test_context.device; context = test_context.immediate_context; + desc.Width = 640; + desc.Height = 480; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = 0; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_color(texture, 0x00000000, 0); + ID3D11Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_color(texture, 0x00000000, 0); + ID3D11Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D32_FLOAT; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_float(texture, 0.0f, 0); + ID3D11Texture2D_Release(texture); + + desc.ArraySize = 4; + + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_float(texture, 0.0f, 0); + ID3D11Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_color(texture, 0x00000000, 0); + ID3D11Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D32_FLOAT; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_float(texture, 0.0f, 0); + ID3D11Texture2D_Release(texture); + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); if (!count) { skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping tests.\n"); - goto done; + release_test_context(&test_context); + return; } ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); - desc.Width = 640; - desc.Height = 480; - desc.MipLevels = 1; desc.ArraySize = 1; desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; desc.SampleDesc.Count = 2; desc.SampleDesc.Quality = 0; - desc.Usage = D3D11_USAGE_DEFAULT; desc.BindFlags = D3D11_BIND_RENDER_TARGET; - desc.CPUAccessFlags = 0; - desc.MiscFlags = 0; - hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &multi); + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); ID3D11DeviceContext_ResolveSubresource(context, (ID3D11Resource *)test_context.backbuffer, 0, - (ID3D11Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + (ID3D11Resource *)texture, 0, DXGI_FORMAT_R8G8B8A8_UNORM); todo_wine check_texture_color(test_context.backbuffer, 0x00000000, 0); - ID3D11Texture2D_Release(multi); -done: + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); } @@ -6232,7 +6276,7 @@ START_TEST(d3d11) test_update_subresource(); test_copy_subresource_region(); test_resource_map(); - test_multisample_init(); + test_texture_data_init(); test_check_multisample_quality_levels(); test_swapchain_flip(); test_clear_render_target_view();

1 0

Józef Kucia : d3d10core/tests: Add more tests for texture data initialization.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: b3b4a943dd86c52fa997bf8cdb02d9243ac219c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b4a943dd86c52fa997bf8cd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:36 2016 +0200 d3d10core/tests: Add more tests for texture data initialization. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 72 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 14 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 3783da5..13df12b 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5330,12 +5330,12 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } -static void test_multisample_init(void) +static void test_texture_data_init(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; struct d3d10core_test_context test_context; D3D10_TEXTURE2D_DESC desc; - ID3D10Texture2D *multi; + ID3D10Texture2D *texture; ID3D10Device *device; UINT count = 0; HRESULT hr; @@ -5345,37 +5345,81 @@ static void test_multisample_init(void) device = test_context.device; + desc.Width = 640; + desc.Height = 480; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = 0; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_color(texture, 0x00000000, 0); + ID3D10Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_color(texture, 0x00000000, 0); + ID3D10Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D32_FLOAT; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_float(texture, 0.0f, 0); + ID3D10Texture2D_Release(texture); + + desc.ArraySize = 4; + + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_float(texture, 0.0f, 0); + ID3D10Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_color(texture, 0x00000000, 0); + ID3D10Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D32_FLOAT; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_float(texture, 0.0f, 0); + ID3D10Texture2D_Release(texture); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); if (!count) { skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping tests.\n"); - goto done; + release_test_context(&test_context); + return; } ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); - desc.Width = 640; - desc.Height = 480; - desc.MipLevels = 1; desc.ArraySize = 1; desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; desc.SampleDesc.Count = 2; desc.SampleDesc.Quality = 0; - desc.Usage = D3D10_USAGE_DEFAULT; desc.BindFlags = D3D10_BIND_RENDER_TARGET; - desc.CPUAccessFlags = 0; - desc.MiscFlags = 0; - hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &multi); + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)test_context.backbuffer, 0, - (ID3D10Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + (ID3D10Resource *)texture, 0, DXGI_FORMAT_R8G8B8A8_UNORM); todo_wine check_texture_color(test_context.backbuffer, 0x00000000, 0); - ID3D10Texture2D_Release(multi); -done: + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); } @@ -6287,7 +6331,7 @@ START_TEST(device) test_fragment_coords(); test_update_subresource(); test_copy_subresource_region(); - test_multisample_init(); + test_texture_data_init(); test_check_multisample_quality_levels(); test_cb_relative_addressing(); test_swapchain_flip();

1 0

Józef Kucia : d3d11/tests: Tests creating 2D array texture views.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: aca6182469f66aff9e54c3c9a2f6e3f1044e80c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca6182469f66aff9e54c3c9a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:41 2016 +0200 d3d11/tests: Tests creating 2D array texture views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 87 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 33c26d4..8ba6a77 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1673,16 +1673,18 @@ static void test_create_depthstencil_view(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D11Device_Release(tmp); + memset(&dsv_desc, 0, sizeof(dsv_desc)); ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); ok(dsv_desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); ok(!dsv_desc.Flags, "Got unexpected flags %#x.\n", dsv_desc.Flags); - ok(U(dsv_desc).Texture2D.MipSlice == 0, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); ID3D11DepthStencilView_Release(dsview); dsv_desc.Format = DXGI_FORMAT_UNKNOWN; + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, &dsv_desc, &dsview); ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); @@ -1692,10 +1694,33 @@ static void test_create_depthstencil_view(void) ok(dsv_desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); ok(!dsv_desc.Flags, "Got unexpected flags %#x.\n", dsv_desc.Flags); - ok(!U(dsv_desc).Texture2D.MipSlice, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); ID3D11DepthStencilView_Release(dsview); + ID3D11Texture2D_Release(texture); + + texture_desc.ArraySize = 4; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsview); + ok(SUCCEEDED(hr), "Failed to create depthstencil view, hr %#x.\n", hr); + + memset(&dsv_desc, 0, sizeof(dsv_desc)); + ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); + ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); + ok(dsv_desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2DARRAY, + "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); + ok(!dsv_desc.Flags, "Got unexpected flags %#x.\n", dsv_desc.Flags); + ok(!U(dsv_desc).Texture2DArray.MipSlice, "Got unexpected mip slice %u.\n", + U(dsv_desc).Texture2DArray.MipSlice); + ok(!U(dsv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", + U(dsv_desc).Texture2DArray.FirstArraySlice); + todo_wine ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, + "Got unexpected array size %u.\n", U(dsv_desc).Texture2DArray.ArraySize); + + ID3D11DepthStencilView_Release(dsview); ID3D11Texture2D_Release(texture); refcount = ID3D11Device_Release(device); @@ -1858,11 +1883,12 @@ static void test_create_rendertarget_view(void) hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtview); ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x.\n", hr); + memset(&rtv_desc, 0, sizeof(rtv_desc)); ID3D11RenderTargetView_GetDesc(rtview, &rtv_desc); ok(rtv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", rtv_desc.Format); ok(rtv_desc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", rtv_desc.ViewDimension); - ok(U(rtv_desc).Texture2D.MipSlice == 0, "Got unexpected mip slice %#x.\n", U(rtv_desc).Texture2D.MipSlice); + ok(!U(rtv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(rtv_desc).Texture2D.MipSlice); hr = ID3D11RenderTargetView_QueryInterface(rtview, &IID_ID3D10RenderTargetView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -1872,6 +1898,7 @@ static void test_create_rendertarget_view(void) ID3D11RenderTargetView_Release(rtview); rtv_desc.Format = DXGI_FORMAT_UNKNOWN; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtview); ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x.\n", hr); @@ -1880,10 +1907,32 @@ static void test_create_rendertarget_view(void) todo_wine ok(rtv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", rtv_desc.Format); ok(rtv_desc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", rtv_desc.ViewDimension); - ok(!U(rtv_desc).Texture2D.MipSlice, "Got unexpected mip slice %#x.\n", U(rtv_desc).Texture2D.MipSlice); + ok(!U(rtv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(rtv_desc).Texture2D.MipSlice); ID3D11RenderTargetView_Release(rtview); + ID3D11Texture2D_Release(texture); + texture_desc.ArraySize = 4; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtview); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + memset(&rtv_desc, 0, sizeof(rtv_desc)); + ID3D11RenderTargetView_GetDesc(rtview, &rtv_desc); + ok(rtv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", rtv_desc.Format); + ok(rtv_desc.ViewDimension == D3D11_RTV_DIMENSION_TEXTURE2DARRAY, "Got unexpected view dimension %#x.\n", + rtv_desc.ViewDimension); + ok(!U(rtv_desc).Texture2DArray.MipSlice, "Got unexpected mip slice %u.\n", + U(rtv_desc).Texture2DArray.MipSlice); + ok(!U(rtv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", + U(rtv_desc).Texture2DArray.FirstArraySlice); + todo_wine ok(U(rtv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n", + U(rtv_desc).Texture2DArray.ArraySize); + + ID3D11RenderTargetView_Release(rtview); ID3D11Texture2D_Release(texture); refcount = ID3D11Device_Release(device); @@ -1979,6 +2028,7 @@ static void test_create_shader_resource_view(void) "Shader resource view should implement ID3D10ShaderResourceView1.\n"); if (SUCCEEDED(hr)) IUnknown_Release(iface); + memset(&srv_desc, 0, sizeof(srv_desc)); ID3D11ShaderResourceView_GetDesc(srview, &srv_desc); ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format); ok(srv_desc.ViewDimension == D3D11_SRV_DIMENSION_TEXTURE2D, @@ -1990,6 +2040,8 @@ static void test_create_shader_resource_view(void) ID3D11ShaderResourceView_Release(srview); srv_desc.Format = DXGI_FORMAT_UNKNOWN; + U(srv_desc).Texture2D.MipLevels = -1; + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, &srv_desc, &srview); ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x.\n", hr); @@ -2000,10 +2052,35 @@ static void test_create_shader_resource_view(void) "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); ok(U(srv_desc).Texture2D.MostDetailedMip == 0, "Got unexpected MostDetailedMip %u.\n", U(srv_desc).Texture2D.MostDetailedMip); - ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); + todo_wine ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", + U(srv_desc).Texture2D.MipLevels); ID3D11ShaderResourceView_Release(srview); + ID3D11Texture2D_Release(texture); + + texture_desc.ArraySize = 4; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srview); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + + memset(&srv_desc, 0, sizeof(srv_desc)); + ID3D11ShaderResourceView_GetDesc(srview, &srv_desc); + ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format); + ok(srv_desc.ViewDimension == D3D11_SRV_DIMENSION_TEXTURE2DARRAY, + "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); + ok(!U(srv_desc).Texture2DArray.MostDetailedMip, "Got unexpected MostDetailedMip %u.\n", + U(srv_desc).Texture2DArray.MostDetailedMip); + ok(U(srv_desc).Texture2DArray.MipLevels == 10, "Got unexpected MipLevels %u.\n", + U(srv_desc).Texture2DArray.MipLevels); + ok(!U(srv_desc).Texture2DArray.FirstArraySlice, "Got unexpected FirstArraySlice %u.\n", + U(srv_desc).Texture2DArray.FirstArraySlice); + ok(U(srv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected ArraySize %u.\n", + U(srv_desc).Texture2DArray.ArraySize); + + ID3D11ShaderResourceView_Release(srview); ID3D11Texture2D_Release(texture); refcount = ID3D11Device_Release(device);

1 0

Józef Kucia : d3d10core/tests: Test creating 2D array texture views.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: 28f4b696ac561e4b9b3763ba8fd721fbad87838b URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f4b696ac561e4b9b3763ba8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:40 2016 +0200 d3d10core/tests: Test creating 2D array texture views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 84 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 80 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f9a17f4..6978c26 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1170,15 +1170,17 @@ static void test_create_depthstencil_view(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); + memset(&dsv_desc, 0, sizeof(dsv_desc)); ID3D10DepthStencilView_GetDesc(dsview, &dsv_desc); ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); ok(dsv_desc.ViewDimension == D3D10_DSV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); - ok(U(dsv_desc).Texture2D.MipSlice == 0, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); ID3D10DepthStencilView_Release(dsview); dsv_desc.Format = DXGI_FORMAT_UNKNOWN; + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, &dsv_desc, &dsview); ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); @@ -1187,10 +1189,32 @@ static void test_create_depthstencil_view(void) todo_wine ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); ok(dsv_desc.ViewDimension == D3D10_DSV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); - ok(!U(dsv_desc).Texture2D.MipSlice, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + ok(!U(dsv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); ID3D10DepthStencilView_Release(dsview); + ID3D10Texture2D_Release(texture); + + texture_desc.ArraySize = 4; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, NULL, &dsview); + ok(SUCCEEDED(hr), "Failed to create depthstencil view, hr %#x.\n", hr); + + memset(&dsv_desc, 0, sizeof(dsv_desc)); + ID3D10DepthStencilView_GetDesc(dsview, &dsv_desc); + ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); + ok(dsv_desc.ViewDimension == D3D10_DSV_DIMENSION_TEXTURE2DARRAY, + "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); + ok(!U(dsv_desc).Texture2DArray.MipSlice, "Got unexpected mip slice %u.\n", + U(dsv_desc).Texture2DArray.MipSlice); + ok(!U(dsv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", + U(dsv_desc).Texture2DArray.FirstArraySlice); + todo_wine ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, + "Got unexpected array size %u.\n", U(dsv_desc).Texture2DArray.ArraySize); + ID3D10DepthStencilView_Release(dsview); ID3D10Texture2D_Release(texture); refcount = ID3D10Device_Release(device); @@ -1352,6 +1376,7 @@ static void test_create_rendertarget_view(void) hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtview); ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x\n", hr); + memset(&rtv_desc, 0, sizeof(rtv_desc)); ID3D10RenderTargetView_GetDesc(rtview, &rtv_desc); ok(rtv_desc.Format == texture_desc.Format, "Expected format %#x, got %#x\n", texture_desc.Format, rtv_desc.Format); ok(rtv_desc.ViewDimension == D3D10_RTV_DIMENSION_TEXTURE2D, @@ -1366,6 +1391,7 @@ static void test_create_rendertarget_view(void) ID3D10RenderTargetView_Release(rtview); rtv_desc.Format = DXGI_FORMAT_UNKNOWN; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtview); ok(SUCCEEDED(hr), "Failed to create a rendertarget view, hr %#x.\n", hr); @@ -1374,10 +1400,32 @@ static void test_create_rendertarget_view(void) todo_wine ok(rtv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", rtv_desc.Format); ok(rtv_desc.ViewDimension == D3D10_RTV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", rtv_desc.ViewDimension); - ok(!U(rtv_desc).Texture2D.MipSlice, "Got unexpected mip slice %#x.\n", U(rtv_desc).Texture2D.MipSlice); + ok(!U(rtv_desc).Texture2D.MipSlice, "Got unexpected mip slice %u.\n", U(rtv_desc).Texture2D.MipSlice); ID3D10RenderTargetView_Release(rtview); + ID3D10Texture2D_Release(texture); + + texture_desc.ArraySize = 4; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtview); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + memset(&rtv_desc, 0, sizeof(rtv_desc)); + ID3D10RenderTargetView_GetDesc(rtview, &rtv_desc); + ok(rtv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", rtv_desc.Format); + ok(rtv_desc.ViewDimension == D3D10_RTV_DIMENSION_TEXTURE2DARRAY, "Got unexpected view dimension %#x.\n", + rtv_desc.ViewDimension); + ok(!U(rtv_desc).Texture2DArray.MipSlice, "Got unexpected mip slice %u.\n", + U(rtv_desc).Texture2DArray.MipSlice); + ok(!U(rtv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", + U(rtv_desc).Texture2DArray.FirstArraySlice); + todo_wine ok(U(rtv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n", + U(rtv_desc).Texture2DArray.ArraySize); + ID3D10RenderTargetView_Release(rtview); ID3D10Texture2D_Release(texture); refcount = ID3D10Device_Release(device); @@ -1463,6 +1511,7 @@ static void test_create_shader_resource_view(void) hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srview); ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x\n", hr); + memset(&srv_desc, 0, sizeof(srv_desc)); ID3D10ShaderResourceView_GetDesc(srview, &srv_desc); ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format); ok(srv_desc.ViewDimension == D3D10_SRV_DIMENSION_TEXTURE2D, @@ -1483,6 +1532,8 @@ static void test_create_shader_resource_view(void) ID3D10ShaderResourceView_Release(srview); srv_desc.Format = DXGI_FORMAT_UNKNOWN; + U(srv_desc).Texture2D.MipLevels = -1; + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, &srv_desc, &srview); ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x.\n", hr); @@ -1493,10 +1544,35 @@ static void test_create_shader_resource_view(void) "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); ok(U(srv_desc).Texture2D.MostDetailedMip == 0, "Got unexpected MostDetailedMip %u.\n", U(srv_desc).Texture2D.MostDetailedMip); - ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); + todo_wine ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", + U(srv_desc).Texture2D.MipLevels); ID3D10ShaderResourceView_Release(srview); + ID3D10Texture2D_Release(texture); + + texture_desc.ArraySize = 4; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srview); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + + memset(&srv_desc, 0, sizeof(srv_desc)); + ID3D10ShaderResourceView_GetDesc(srview, &srv_desc); + ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format); + ok(srv_desc.ViewDimension == D3D10_SRV_DIMENSION_TEXTURE2DARRAY, + "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); + ok(!U(srv_desc).Texture2DArray.MostDetailedMip, "Got unexpected MostDetailedMip %u.\n", + U(srv_desc).Texture2DArray.MostDetailedMip); + ok(U(srv_desc).Texture2DArray.MipLevels == 10, "Got unexpected MipLevels %u.\n", + U(srv_desc).Texture2DArray.MipLevels); + ok(!U(srv_desc).Texture2DArray.FirstArraySlice, "Got unexpected FirstArraySlice %u.\n", + U(srv_desc).Texture2DArray.FirstArraySlice); + ok(U(srv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected ArraySize %u.\n", + U(srv_desc).Texture2DArray.ArraySize); + + ID3D10ShaderResourceView_Release(srview); ID3D10Texture2D_Release(texture); refcount = ID3D10Device_Release(device);

1 0

Nikolay Sivov : dwrite/tests: Test underline/ strikethrough metrics for all system fonts.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: f94447526aaff46a638c7407bd6519c1382a7b1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94447526aaff46a638c7407b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 10 23:59:10 2016 +0300 dwrite/tests: Test underline/strikethrough metrics for all system fonts. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 224 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 217 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ec631bd..0c060b8 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1,7 +1,7 @@ /* * Font related tests * - * Copyright 2012, 2014 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2016 Nikolay Sivov for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -40,6 +40,16 @@ #define MS_VDMX_TAG MS_MAKE_TAG('V','D','M','X') #define MS_GASP_TAG MS_MAKE_TAG('g','a','s','p') #define MS_CPAL_TAG MS_MAKE_TAG('C','P','A','L') +#define MS_0S2_TAG MS_MAKE_TAG('O','S','/','2') +#define MS_HEAD_TAG MS_MAKE_TAG('h','e','a','d') +#define MS_HHEA_TAG MS_MAKE_TAG('h','h','e','a') +#define MS_POST_TAG MS_MAKE_TAG('p','o','s','t') + +#ifdef WORDS_BIGENDIAN +#define GET_BE_WORD(x) (x) +#else +#define GET_BE_WORD(x) RtlUshortByteSwap(x) +#endif #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -100,6 +110,90 @@ static const WCHAR tahomaStrangecaseW[] = {'t','A','h','O','m','A',0}; static const WCHAR blahW[] = {'B','l','a','h','!',0}; static const WCHAR emojiW[] = {'S','e','g','o','e',' ','U','I',' ','E','m','o','j','i',0}; +/* PANOSE is 10 bytes in size, need to pack the structure properly */ +#include "pshpack2.h" +typedef struct +{ + ULONG version; + ULONG revision; + ULONG checksumadj; + ULONG magic; + USHORT flags; + USHORT unitsPerEm; + ULONGLONG created; + ULONGLONG modified; + SHORT xMin; + SHORT yMin; + SHORT xMax; + SHORT yMax; + USHORT macStyle; + USHORT lowestRecPPEM; + SHORT direction_hint; + SHORT index_format; + SHORT glyphdata_format; +} TT_HEAD; + +typedef struct +{ + USHORT version; + SHORT xAvgCharWidth; + USHORT usWeightClass; + USHORT usWidthClass; + SHORT fsType; + SHORT ySubscriptXSize; + SHORT ySubscriptYSize; + SHORT ySubscriptXOffset; + SHORT ySubscriptYOffset; + SHORT ySuperscriptXSize; + SHORT ySuperscriptYSize; + SHORT ySuperscriptXOffset; + SHORT ySuperscriptYOffset; + SHORT yStrikeoutSize; + SHORT yStrikeoutPosition; + SHORT sFamilyClass; + PANOSE panose; + ULONG ulUnicodeRange1; + ULONG ulUnicodeRange2; + ULONG ulUnicodeRange3; + ULONG ulUnicodeRange4; + CHAR achVendID[4]; + USHORT fsSelection; + USHORT usFirstCharIndex; + USHORT usLastCharIndex; + /* According to the Apple spec, original version didn't have the below fields, + * version numbers were taken from the OpenType spec. + */ + /* version 0 (TrueType 1.5) */ + USHORT sTypoAscender; + USHORT sTypoDescender; + USHORT sTypoLineGap; + USHORT usWinAscent; + USHORT usWinDescent; + /* version 1 (TrueType 1.66) */ + ULONG ulCodePageRange1; + ULONG ulCodePageRange2; + /* version 2 (OpenType 1.2) */ + SHORT sxHeight; + SHORT sCapHeight; + USHORT usDefaultChar; + USHORT usBreakChar; + USHORT usMaxContext; +} TT_OS2_V2; + +typedef struct { + ULONG Version; + ULONG italicAngle; + SHORT underlinePosition; + SHORT underlineThickness; + ULONG fixed_pitch; + ULONG minmemType42; + ULONG maxmemType42; + ULONG minmemType1; + ULONG maxmemType1; +} TT_POST; + +#include "poppack.h" + static IDWriteFactory *create_factory(void) { IDWriteFactory *factory; @@ -1425,9 +1519,92 @@ todo_wine DELETE_FONTFILE(path); } +static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_METRICS *metrics) +{ + void *os2_context, *head_context, *post_context; + const TT_OS2_V2 *tt_os2; + const TT_HEAD *tt_head; + const TT_POST *tt_post; + UINT32 size; + BOOL exists; + HRESULT hr; + + memset(metrics, 0, sizeof(*metrics)); + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void**)&tt_os2, &size, &os2_context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_HEAD_TAG, (const void**)&tt_head, &size, &head_context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_POST_TAG, (const void**)&tt_post, &size, &post_context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (tt_head) + metrics->designUnitsPerEm = GET_BE_WORD(tt_head->unitsPerEm); + + if (tt_os2) { + metrics->strikethroughPosition = GET_BE_WORD(tt_os2->yStrikeoutPosition); + metrics->strikethroughThickness = GET_BE_WORD(tt_os2->yStrikeoutSize); + } + + if (tt_post) { + metrics->underlinePosition = GET_BE_WORD(tt_post->underlinePosition); + metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness); + } + + if (metrics->strikethroughThickness || metrics->underlineThickness) { + if (!metrics->strikethroughThickness) + metrics->strikethroughThickness = metrics->underlineThickness; + if (!metrics->underlineThickness) + metrics->underlineThickness = metrics->strikethroughThickness; + } + else { + metrics->strikethroughThickness = metrics->designUnitsPerEm / 14; + metrics->underlineThickness = metrics->designUnitsPerEm / 14; + } + + if (tt_os2) + IDWriteFontFace_ReleaseFontTable(fontface, os2_context); + if (tt_head) + IDWriteFontFace_ReleaseFontTable(fontface, head_context); + if (tt_post) + IDWriteFontFace_ReleaseFontTable(fontface, post_context); +} + +static void check_font_metrics(const WCHAR *nameW, const DWRITE_FONT_METRICS *got, const DWRITE_FONT_METRICS *expected) +{ + ok(got->designUnitsPerEm == expected->designUnitsPerEm, "font %s: designUnitsPerEm %u, expected %u\n", + wine_dbgstr_w(nameW), got->designUnitsPerEm, expected->designUnitsPerEm); + ok(got->underlinePosition == expected->underlinePosition, "font %s: underlinePosition %d, expected %d\n", + wine_dbgstr_w(nameW), got->underlinePosition, expected->underlinePosition); +todo_wine_if(got->underlineThickness == 0) + ok(got->underlineThickness == expected->underlineThickness, "font %s: underlineThickness %u, " + "expected %u\n", wine_dbgstr_w(nameW), got->underlineThickness, expected->underlineThickness); + ok(got->strikethroughPosition == expected->strikethroughPosition, "font %s: strikethroughPosition %d, expected %d\n", + wine_dbgstr_w(nameW), got->strikethroughPosition, expected->strikethroughPosition); +todo_wine_if(got->strikethroughThickness == 0) + ok(got->strikethroughThickness == expected->strikethroughThickness, "font %s: strikethroughThickness %u, " + "expected %u\n", wine_dbgstr_w(nameW), got->strikethroughThickness, expected->strikethroughThickness); +} + +static void get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, UINT32 size) +{ + static const WCHAR enusW[] = {'e','n','-','u','s',0}; + BOOL exists = FALSE; + UINT32 index; + HRESULT hr; + + hr = IDWriteLocalizedStrings_FindLocaleName(strings, enusW, &index, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists, "got %d\n", exists); + + hr = IDWriteLocalizedStrings_GetString(strings, index, buff, size); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + static void test_GetMetrics(void) { DWRITE_FONT_METRICS metrics, metrics2; + IDWriteFontCollection *syscollection; IDWriteGdiInterop *interop; IDWriteFontFace *fontface; IDWriteFactory *factory; @@ -1436,7 +1613,7 @@ static void test_GetMetrics(void) IDWriteFont1 *font1; IDWriteFont *font; LOGFONTW logfont; - UINT32 count; + UINT32 count, i; HRESULT hr; HDC hdc; HFONT hfont; @@ -1607,6 +1784,44 @@ if (0) /* crashes on native */ IDWriteFontFile_Release(file); IDWriteFont_Release(font); + /* test metrics for whole system collection */ + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection_GetFontFamilyCount(syscollection); + + for (i = 0; i < count; i++) { + DWRITE_FONT_METRICS expected_metrics; + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + IDWriteFont *font; + WCHAR nameW[256]; + + hr = IDWriteFontCollection_GetFontFamily(syscollection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, + DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + get_enus_string(names, nameW, sizeof(nameW)/sizeof(nameW[0])); + + IDWriteLocalizedStrings_Release(names); + IDWriteFont_Release(font); + + IDWriteFontFace_GetMetrics(fontface, &metrics); + get_expected_font_metrics(fontface, &expected_metrics); + check_font_metrics(nameW, &metrics, &expected_metrics); + + IDWriteFontFace_Release(fontface); + IDWriteFontFamily_Release(family); + } + IDWriteFontCollection_Release(syscollection); IDWriteFactory_Release(factory); } @@ -4036,11 +4251,6 @@ struct VDMX_vTable SHORT yMin; }; -#ifdef WORDS_BIGENDIAN -#define GET_BE_WORD(x) (x) -#else -#define GET_BE_WORD(x) RtlUshortByteSwap(x) -#endif static const struct VDMX_group *find_vdmx_group(const struct VDMX_Header *hdr) {

1 0

Nikolay Sivov : dwrite: Always return non-zero metrics for strikethrough/ underline thickness.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: 137030bf7781a1ae9797667e555d2df46ab59920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=137030bf7781a1ae9797667e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 10 23:59:11 2016 +0300 dwrite: Always return non-zero metrics for strikethrough/underline thickness. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 12 ++++++++++++ dlls/dwrite/tests/font.c | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 97a786d..b9bddea 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1204,6 +1204,18 @@ void opentype_get_font_metrics(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_T metrics->underlineThickness = GET_BE_WORD(tt_post->underlineThickness); } + /* use any of thickness values if another one is zero, if both are zero use estimate */ + if (metrics->strikethroughThickness || metrics->underlineThickness) { + if (!metrics->strikethroughThickness) + metrics->strikethroughThickness = metrics->underlineThickness; + if (!metrics->underlineThickness) + metrics->underlineThickness = metrics->strikethroughThickness; + } + else { + metrics->strikethroughThickness = metrics->designUnitsPerEm / 14; + metrics->underlineThickness = metrics->designUnitsPerEm / 14; + } + /* estimate missing metrics */ if (metrics->xHeight == 0) metrics->xHeight = metrics->designUnitsPerEm / 2; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 0c060b8..5591913 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1576,12 +1576,10 @@ static void check_font_metrics(const WCHAR *nameW, const DWRITE_FONT_METRICS *go wine_dbgstr_w(nameW), got->designUnitsPerEm, expected->designUnitsPerEm); ok(got->underlinePosition == expected->underlinePosition, "font %s: underlinePosition %d, expected %d\n", wine_dbgstr_w(nameW), got->underlinePosition, expected->underlinePosition); -todo_wine_if(got->underlineThickness == 0) ok(got->underlineThickness == expected->underlineThickness, "font %s: underlineThickness %u, " "expected %u\n", wine_dbgstr_w(nameW), got->underlineThickness, expected->underlineThickness); ok(got->strikethroughPosition == expected->strikethroughPosition, "font %s: strikethroughPosition %d, expected %d\n", wine_dbgstr_w(nameW), got->strikethroughPosition, expected->strikethroughPosition); -todo_wine_if(got->strikethroughThickness == 0) ok(got->strikethroughThickness == expected->strikethroughThickness, "font %s: strikethroughThickness %u, " "expected %u\n", wine_dbgstr_w(nameW), got->strikethroughThickness, expected->strikethroughThickness); }

1 0

Stefan Dösinger : wined3d: Discard default pool surfaces on unload.
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: e55754bf740b34e63ca3ae7f6522eb57632614c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55754bf740b34e63ca3ae7f6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 10 18:09:31 2016 +0200 wined3d: Discard default pool surfaces on unload. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bbf05db..aab5d73 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -887,27 +887,10 @@ static void surface_unload(struct wined3d_resource *resource) if (resource->pool == WINED3D_POOL_DEFAULT) { - /* Default pool resources are supposed to be destroyed before Reset is called. - * Implicit resources stay however. So this means we have an implicit render target - * or depth stencil. The content may be destroyed, but we still have to tear down - * opengl resources, so we cannot leave early. - * - * Put the surfaces into sysmem, and reset the content. The D3D content is undefined, - * but we can't set the sysmem INDRAWABLE because when we're rendering the swapchain - * or the depth stencil into an FBO the texture or render buffer will be removed - * and all flags get lost */ - if (resource->usage & WINED3DUSAGE_DEPTHSTENCIL) - { - wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~WINED3D_LOCATION_DISCARDED); - } - else - { - surface_prepare_system_memory(surface); - memset(surface->resource.heap_memory, 0, surface->resource.size); - wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_SYSMEM); - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~WINED3D_LOCATION_SYSMEM); - } + /* We should only get here on device reset/teardown for implicit + * resources. */ + wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~WINED3D_LOCATION_DISCARDED); } else {

1 0

Henri Verbeet : wined3d: Don' t evict mapped resources in wined3d_device_evict_managed_resources().
by Alexandre Julliard April 11, 2016

April 11, 2016

Module: wine Branch: master Commit: bcb1ee82449d8e56caa4268118c7590e0385162b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcb1ee82449d8e56caa426811… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 10 18:09:26 2016 +0200 wined3d: Don't evict mapped resources in wined3d_device_evict_managed_resources(). We would skip evicting the specific mapped sub-resource, but then go on to evict the texture itself. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 ++++ dlls/wined3d/texture.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 619ad1e..b1d8631 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4503,6 +4503,10 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) { TRACE("Checking resource %p for eviction.\n", resource); + /* These are handled by the texture they're part of. */ + if (resource->type == WINED3D_RTYPE_SURFACE || resource->type == WINED3D_RTYPE_VOLUME) + continue; + if (resource->pool == WINED3D_POOL_MANAGED && !resource->map_count) { TRACE("Evicting %p.\n", resource); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0a89665..393c2f8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1408,6 +1408,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour TRACE("Mapped front buffer %s.\n", wine_dbgstr_rect(r)); } + ++resource->map_count; ++sub_resource->resource->map_count; TRACE("Returning memory %p, row pitch %u, slice pitch %u.\n", @@ -1473,6 +1474,7 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso } --sub_resource->resource->map_count; + --resource->map_count; return WINED3D_OK; } @@ -2263,6 +2265,7 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i context_release(context); surface->flags |= SFLAG_DCINUSE; + ++texture->resource.map_count; surface->resource.map_count++; *dc = surface->hDC; @@ -2302,6 +2305,7 @@ HRESULT CDECL wined3d_texture_release_dc(struct wined3d_texture *texture, unsign } surface->resource.map_count--; + --texture->resource.map_count; surface->flags &= ~SFLAG_DCINUSE; if (surface->resource.map_binding == WINED3D_LOCATION_USER_MEMORY

1 0