November 2016 - Wine-commits

Józef Kucia : d3d11/tests: Initialize buffer data in test_copy_subresource_region().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: 9e2ac906146c748082889e1324feb10006ed23b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e2ac906146c748082889e132… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:21 2016 +0100 d3d11/tests: Initialize buffer data in test_copy_subresource_region(). This test fails randomly on Windows 10 with AMD GPU. 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 54df386..38a3d65 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7157,7 +7157,8 @@ static void test_copy_subresource_region(void) ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler_state); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); - dst_buffer = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(float_colors), NULL); + memset(float_colors, 0, sizeof(float_colors)); + dst_buffer = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(float_colors), float_colors); ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &dst_buffer); src_buffer = create_buffer(device, 0, 256 * sizeof(*float_colors), NULL);

1 0

Józef Kucia : d3d10core/tests: Initialize buffer data in test_copy_subresource_region().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: d78aa12da650dd2ed8f246c3fcf1d8aa0de471cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d78aa12da650dd2ed8f246c3f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:22 2016 +0100 d3d10core/tests: Initialize buffer data in test_copy_subresource_region(). This test fails randomly on Windows 10 with AMD GPU. 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e617319..fc0745a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6859,7 +6859,8 @@ static void test_copy_subresource_region(void) ID3D10Device_PSSetSamplers(device, 0, 1, &sampler_state); ID3D10Device_PSSetShader(device, ps); - dst_buffer = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(float_colors), NULL); + memset(float_colors, 0, sizeof(float_colors)); + dst_buffer = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(float_colors), float_colors); ID3D10Device_PSSetConstantBuffers(device, 0, 1, &dst_buffer);

1 0

Józef Kucia : d3d11/tests: Initialize texture data in test_update_subresource().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: 0175a267a80750960c6124b1710e6561630b8793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0175a267a80750960c6124b17… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:23 2016 +0100 d3d11/tests: Initialize texture data in test_update_subresource(). Fixes test failures on Intel GPUs. 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 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 38a3d65..d66f929 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6781,6 +6781,7 @@ static void test_fragment_coords(void) static void test_update_subresource(void) { struct d3d11_test_context test_context; + D3D11_SUBRESOURCE_DATA resource_data; D3D11_TEXTURE2D_DESC texture_desc; ID3D11SamplerState *sampler_state; ID3D11ShaderResourceView *ps_srv; @@ -6822,6 +6823,7 @@ static void test_update_subresource(void) 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, }; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD initial_data[16] = {0}; static const DWORD bitmap_data[] = { 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, @@ -6855,7 +6857,11 @@ static void test_update_subresource(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + resource_data.pSysMem = initial_data; + resource_data.SysMemPitch = texture_desc.Width * sizeof(*initial_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &ps_srv);

1 0

Józef Kucia : d3d10core/tests: Initialize texture data in test_update_subresource().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: 5b155ea16c3f8513b086dcc36ea4d058df132859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b155ea16c3f8513b086dcc36… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:24 2016 +0100 d3d10core/tests: Initialize texture data in test_update_subresource(). Fixes test failures on Intel GPUs. 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 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index fc0745a..3bd6ea6 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6487,6 +6487,7 @@ static void test_fragment_coords(void) static void test_update_subresource(void) { struct d3d10core_test_context test_context; + D3D10_SUBRESOURCE_DATA resource_data; D3D10_TEXTURE2D_DESC texture_desc; ID3D10SamplerState *sampler_state; ID3D10ShaderResourceView *ps_srv; @@ -6527,6 +6528,7 @@ static void test_update_subresource(void) 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, }; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD initial_data[16] = {0}; static const DWORD bitmap_data[] = { 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, @@ -6559,7 +6561,11 @@ static void test_update_subresource(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + resource_data.pSysMem = initial_data; + resource_data.SysMemPitch = texture_desc.Width * sizeof(*initial_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &ps_srv);

1 0

Józef Kucia : d3d11/tests: Initialize texture data in test_copy_subresource_region().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: a893abfd49ce09e9dac10dc1dc4e0ead7c384777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a893abfd49ce09e9dac10dc1d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:25 2016 +0100 d3d11/tests: Initialize texture data in test_copy_subresource_region(). Fixes test failures on Intel GPUs. 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d66f929..23ef146 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7024,6 +7024,7 @@ static void test_copy_subresource_region(void) 0x0010000a, 0x00000000, 0x0100003e, }; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD initial_data[16] = {0}; static const DWORD bitmap_data[] = { 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, @@ -7057,13 +7058,17 @@ static void test_copy_subresource_region(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &dst_texture); + resource_data.pSysMem = initial_data; + resource_data.SysMemPitch = texture_desc.Width * sizeof(*initial_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); texture_desc.Usage = D3D11_USAGE_IMMUTABLE; resource_data.pSysMem = bitmap_data; - resource_data.SysMemPitch = 4 * sizeof(*bitmap_data); + resource_data.SysMemPitch = texture_desc.Width * sizeof(*bitmap_data); resource_data.SysMemSlicePitch = 0; hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture);

1 0

Józef Kucia : d3d10core/tests: Initialize texture data in test_copy_subresource_region().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: a55c56ee29fccc8e61a0c0cd62eb0414607b1567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a55c56ee29fccc8e61a0c0cd6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:26 2016 +0100 d3d10core/tests: Initialize texture data in test_copy_subresource_region(). Fixes test failures on Intel GPUs. 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 3bd6ea6..fbce77d 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6727,6 +6727,7 @@ static void test_copy_subresource_region(void) 0x0010000a, 0x00000000, 0x0100003e, }; static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD initial_data[16] = {0}; static const DWORD bitmap_data[] = { 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, @@ -6759,13 +6760,17 @@ static void test_copy_subresource_region(void) texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; - hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &dst_texture); + resource_data.pSysMem = initial_data; + resource_data.SysMemPitch = texture_desc.Width * sizeof(*initial_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); ok(SUCCEEDED(hr), "Failed to create 2d texture, hr %#x.\n", hr); texture_desc.Usage = D3D10_USAGE_IMMUTABLE; resource_data.pSysMem = bitmap_data; - resource_data.SysMemPitch = 4 * sizeof(*bitmap_data); + resource_data.SysMemPitch = texture_desc.Width * sizeof(*bitmap_data); resource_data.SysMemSlicePitch = 0; hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture);

1 0

Józef Kucia : d3d11/tests: Remove test_buffer_data_init().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: bdaab7a44242291a387f8621b0a4ce07461769d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdaab7a44242291a387f8621b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:27 2016 +0100 d3d11/tests: Remove test_buffer_data_init(). This test fails consistently on Windows 10 with Intel GPU, and MSDN says that the initial content of the resource memory is undefined. Moreover, failures in other tests have shown that the initial buffer data is not always initialized on other vendors GPUs. 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 | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 23ef146..f073d04 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7370,33 +7370,6 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_buffer_data_init(void) -{ - struct resource_readback rb; - ID3D11Buffer *buffer; - ID3D11Device *device; - unsigned int i; - - if (!(device = create_device(NULL))) - { - skip("Failed to create device.\n"); - return; - } - - buffer = create_buffer(device, D3D11_BIND_SHADER_RESOURCE, 1024, NULL); - - get_buffer_readback(buffer, &rb); - for (i = 0; i < rb.width; ++i) - { - DWORD r = get_readback_color(&rb, i / sizeof(DWORD), 0); - ok(!r, "Got unexpected result %#x at offset %u.\n", r, i); - } - release_resource_readback(&rb); - - ID3D11Buffer_Release(buffer); - ID3D11Device_Release(device); -} - static void test_texture_data_init(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -11061,7 +11034,6 @@ START_TEST(d3d11) test_update_subresource(); test_copy_subresource_region(); test_resource_map(); - test_buffer_data_init(); test_texture_data_init(); test_check_multisample_quality_levels(); run_for_each_feature_level(test_swapchain_formats);

1 0

Józef Kucia : d3d10core/tests: Remove test_buffer_data_init().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: 81e7e6cc1fb78c1de5855b699b335a47b8efff56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81e7e6cc1fb78c1de5855b699… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:28 2016 +0100 d3d10core/tests: Remove test_buffer_data_init(). This test fails consistently on Windows 10 with Intel GPU, and MSDN says that the initial content of the resource memory is undefined. Moreover, failures in other tests have shown that the initial buffer data is not always initialized on other vendors GPUs. 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 | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index fbce77d..0633470 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6931,33 +6931,6 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } -static void test_buffer_data_init(void) -{ - struct resource_readback rb; - ID3D10Buffer *buffer; - ID3D10Device *device; - unsigned int i; - - if (!(device = create_device())) - { - skip("Failed to create device.\n"); - return; - } - - buffer = create_buffer(device, D3D10_BIND_SHADER_RESOURCE, 1024, NULL); - - get_buffer_readback(buffer, &rb); - for (i = 0; i < rb.width; ++i) - { - DWORD r = get_readback_color(&rb, i / sizeof(DWORD), 0); - ok(!r, "Got unexpected result %#x at offset %u.\n", r, i); - } - release_resource_readback(&rb); - - ID3D10Buffer_Release(buffer); - ID3D10Device_Release(device); -} - static void test_texture_data_init(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -9753,7 +9726,6 @@ START_TEST(device) test_fragment_coords(); test_update_subresource(); test_copy_subresource_region(); - test_buffer_data_init(); test_texture_data_init(); test_check_multisample_quality_levels(); test_cb_relative_addressing();

1 0

Józef Kucia : d3d11/tests: Remove test_texture_data_init().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: 87ae0a4308283d05e0e5d7196cc26c6de69de4d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ae0a4308283d05e0e5d7196… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:29 2016 +0100 d3d11/tests: Remove test_texture_data_init(). This test fails consistently on Windows 10 with Intel GPU, and MSDN says that the initial content of the resource memory is undefined. Moreover, failures in other tests have shown that the initial texture data is not always initialized on other vendors GPUs. 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 | 96 ------------------------------------------------ 1 file changed, 96 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f073d04..123676d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7370,101 +7370,6 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } -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 *texture; - ID3D11Device *device; - UINT count = 0; - HRESULT hr; - - if (!init_test_context(&test_context, NULL)) - return; - - 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"); - release_test_context(&test_context); - return; - } - - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); - - desc.ArraySize = 1; - desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - desc.SampleDesc.Count = 2; - desc.SampleDesc.Quality = 0; - desc.BindFlags = D3D11_BIND_RENDER_TARGET; - 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 *)texture, 0, DXGI_FORMAT_R8G8B8A8_UNORM); - - todo_wine check_texture_color(test_context.backbuffer, 0x00000000, 0); - - ID3D11Texture2D_Release(texture); - - release_test_context(&test_context); -} - static void test_check_multisample_quality_levels(void) { ID3D11Device *device; @@ -11034,7 +10939,6 @@ START_TEST(d3d11) test_update_subresource(); test_copy_subresource_region(); test_resource_map(); - test_texture_data_init(); test_check_multisample_quality_levels(); run_for_each_feature_level(test_swapchain_formats); test_swapchain_views();

1 0

Józef Kucia : d3d10core/tests: Remove test_texture_data_init().
by Alexandre Julliard 09 Nov '16

09 Nov '16

Module: wine Branch: master Commit: 474288a03ae3cda10483b0cb6e74156833e3d0e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474288a03ae3cda10483b0cb6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Nov 9 12:35:30 2016 +0100 d3d10core/tests: Remove test_texture_data_init(). This test fails consistently on Windows 10 with Intel GPU, and MSDN says that the initial content of the resource memory is undefined. Moreover, failures in other tests have shown that the initial texture data is not always initialized on other vendors GPUs. 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 | 94 ------------------------------------------- 1 file changed, 94 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 0633470..1952a87 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6931,99 +6931,6 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } -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 *texture; - ID3D10Device *device; - UINT count = 0; - HRESULT hr; - - if (!init_test_context(&test_context)) - return; - - 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"); - release_test_context(&test_context); - return; - } - - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); - - desc.ArraySize = 1; - desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - desc.SampleDesc.Count = 2; - desc.SampleDesc.Quality = 0; - desc.BindFlags = D3D10_BIND_RENDER_TARGET; - 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 *)texture, 0, DXGI_FORMAT_R8G8B8A8_UNORM); - - todo_wine check_texture_color(test_context.backbuffer, 0x00000000, 0); - - ID3D10Texture2D_Release(texture); - - release_test_context(&test_context); -} - static void test_check_multisample_quality_levels(void) { ID3D10Device *device; @@ -9726,7 +9633,6 @@ START_TEST(device) test_fragment_coords(); test_update_subresource(); test_copy_subresource_region(); - test_texture_data_init(); test_check_multisample_quality_levels(); test_cb_relative_addressing(); test_swapchain_formats();

1 0