wine-commits October 2018

wine-commits@winehq.org

1 participants
602 discussions

Nikolay Sivov : opcservices: Add missing error check (Coverity).
by Alexandre Julliard 02 Oct '18

02 Oct '18

Module: wine Branch: master Commit: 979183e1f092c65d46f899e1e6b7aa26fcd1f532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=979183e1f092c65d46f899e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 29 23:13:45 2018 +0300 opcservices: Add missing error check (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 06bbb3d..5f4f955 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1941,7 +1941,8 @@ static HRESULT opc_package_write_rels(struct zip_archive *archive, IOpcRelations if (SUCCEEDED(hr)) hr = IXmlWriter_Flush(writer); - hr = IOpcUri_GetRelationshipsPartUri(uri, &rels_uri); + if (SUCCEEDED(hr)) + hr = IOpcUri_GetRelationshipsPartUri(uri, &rels_uri); if (SUCCEEDED(hr)) hr = IOpcPartUri_GetRawUri(rels_uri, &rels_part_uri); if (SUCCEEDED(hr))

1 0

Nikolay Sivov : opcservices: Improve error handling (Coverity).
by Alexandre Julliard 02 Oct '18

02 Oct '18

Module: wine Branch: master Commit: 6cfda8bfff023ce7320d34c5a9b0e6cba2c58abc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cfda8bfff023ce7320d34c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 29 23:13:44 2018 +0300 opcservices: Improve error handling (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 5534fe6..06bbb3d 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1723,7 +1723,8 @@ static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct co if (FAILED(hr)) break; - IOpcPartEnumerator_MoveNext(enumerator, &has_next); + if (FAILED(hr = IOpcPartEnumerator_MoveNext(enumerator, &has_next))) + break; } IOpcPartEnumerator_Release(enumerator);

1 0

Nikolay Sivov : d2d1: Implement d2d_device_context_SetTarget() for bitmap targets.
by Alexandre Julliard 02 Oct '18

02 Oct '18

Module: wine Branch: master Commit: 86f1ab36a9dfa78c8472e49e410be5d3c5e9352f URL: https://source.winehq.org/git/wine.git/?a=commit;h=86f1ab36a9dfa78c8472e49e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 29 02:50:06 2018 +0330 d2d1: Implement d2d_device_context_SetTarget() for bitmap targets. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 23 +++- dlls/d2d1/bitmap_render_target.c | 74 ++++------- dlls/d2d1/d2d1_private.h | 6 +- dlls/d2d1/dc_render_target.c | 96 ++++++-------- dlls/d2d1/device.c | 270 +++++++++++++++++++++------------------ dlls/d2d1/hwnd_render_target.c | 19 ++- dlls/d2d1/tests/d2d1.c | 68 +++++++--- 7 files changed, 294 insertions(+), 262 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=86f1ab36a9dfa78c8472…

1 0

Nikolay Sivov : d2d1: Default to pre-multiplied alpha mode in CreateBitmapFromDxgiSurface().
by Alexandre Julliard 02 Oct '18

02 Oct '18

Module: wine Branch: master Commit: f60455be90beaa567c637d6c862d2dcb06eedb4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f60455be90beaa567c637d6c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 29 02:50:05 2018 +0330 d2d1: Default to pre-multiplied alpha mode in CreateBitmapFromDxgiSurface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 1 + dlls/d2d1/tests/d2d1.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index d1c1845..9bf8ef6 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1852,6 +1852,7 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_CreateBitmapFromDxgiSurface( memset(&bitmap_desc, 0, sizeof(bitmap_desc)); bitmap_desc.pixelFormat.format = surface_desc.Format; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_PREMULTIPLIED; bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; desc = &bitmap_desc; } diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 03d2153..97d27da 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7017,6 +7017,41 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B ID2D1DCRenderTarget_Release(dc_rt); } +static IDXGISurface *create_surface(IDXGIDevice *dxgi_device, DXGI_FORMAT format) +{ + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10Texture2D *texture; + ID3D10Device *d3d_device; + IDXGISurface *surface; + HRESULT hr; + + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = format; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = IDXGIDevice_QueryInterface(dxgi_device, &IID_ID3D10Device, (void **)&d3d_device); + ok(SUCCEEDED(hr), "Failed to get device interface, hr %#x.\n", hr); + + hr = ID3D10Device_CreateTexture2D(d3d_device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a texture, hr %#x.\n", hr); + + hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get surface interface, hr %#x.\n", hr); + + ID3D10Device_Release(d3d_device); + ID3D10Texture2D_Release(texture); + + return surface; +} + static void test_bitmap_surface(void) { static const struct bitmap_format_test @@ -7048,12 +7083,13 @@ static void test_bitmap_surface(void) D2D1_RENDER_TARGET_PROPERTIES rt_desc; D2D1_BITMAP_PROPERTIES1 bitmap_desc; ID2D1DeviceContext *device_context; + IDXGISurface *surface, *surface2; + D2D1_PIXEL_FORMAT pixel_format; ID3D10Device1 *d3d_device; IDXGISwapChain *swapchain; IDXGIDevice *dxgi_device; ID2D1Factory1 *factory; ID2D1RenderTarget *rt; - IDXGISurface *surface; ID2D1Bitmap1 *bitmap; ID2D1Device *device; ID2D1Image *target; @@ -7119,8 +7155,6 @@ if (SUCCEEDED(hr)) { for (i = 0; i < ARRAY_SIZE(bitmap_format_tests); ++i) { - D2D1_PIXEL_FORMAT pixel_format; - memset(&bitmap_desc, 0, sizeof(bitmap_desc)); bitmap_desc.pixelFormat = bitmap_format_tests[i].original; bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; @@ -7141,9 +7175,35 @@ if (SUCCEEDED(hr)) } } + /* A8 surface */ + hr = IDXGISurface_GetDevice(surface, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get the device, hr %#x.\n", hr); + + surface2 = create_surface(dxgi_device, DXGI_FORMAT_A8_UNORM); + + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, surface2, NULL, &bitmap); + ok(SUCCEEDED(hr) || broken(hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) /* Win7 */, + "Failed to create a bitmap, hr %#x.\n", hr); + + if (SUCCEEDED(hr)) + { + pixel_format = ID2D1Bitmap1_GetPixelFormat(bitmap); + ok(pixel_format.alphaMode == D2D1_ALPHA_MODE_PREMULTIPLIED, + "Unexpected alpha mode %#x.\n", pixel_format.alphaMode); + + ID2D1Bitmap1_Release(bitmap); + } + + IDXGIDevice_Release(dxgi_device); + IDXGISurface_Release(surface2); + hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, surface, NULL, &bitmap); ok(SUCCEEDED(hr), "Failed to create a bitmap, hr %#x.\n", hr); + pixel_format = ID2D1Bitmap1_GetPixelFormat(bitmap); + ok(pixel_format.alphaMode == D2D1_ALPHA_MODE_PREMULTIPLIED, + "Unexpected alpha mode %#x.\n", pixel_format.alphaMode); + check_bitmap_surface((ID2D1Bitmap *)bitmap, TRUE, D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW); check_rt_bitmap_surface((ID2D1RenderTarget *)device_context, TRUE, D2D1_BITMAP_OPTIONS_NONE);

1 0

Nikolay Sivov : d2d1: Allow creating zero-sized bitmaps.
by Alexandre Julliard 02 Oct '18

02 Oct '18

Module: wine Branch: master Commit: cc8d53affedd4eb63716d51ed0bd39fd74dae7d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc8d53affedd4eb63716d51e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 29 02:50:04 2018 +0330 d2d1: Allow creating zero-sized bitmaps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 2 ++ dlls/d2d1/tests/d2d1.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 8551462..efb3204 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -317,6 +317,8 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, texture_desc.Width = size.width; texture_desc.Height = size.height; + if (!texture_desc.Width || !texture_desc.Height) + texture_desc.Width = texture_desc.Height = 1; texture_desc.MipLevels = 1; texture_desc.ArraySize = 1; texture_desc.Format = desc->pixelFormat.format; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 4eb1422..03d2153 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -819,6 +819,8 @@ static void check_bitmap_surface_(unsigned int line, ID2D1Bitmap *bitmap, BOOL h ok_(__FILE__, line)(!desc.MiscFlags, "Unexpected misc flags %#x.\n", desc.MiscFlags); pixel_size = ID2D1Bitmap_GetPixelSize(bitmap); + if (!pixel_size.width || !pixel_size.height) + pixel_size.width = pixel_size.height = 1; ok_(__FILE__, line)(desc.Width == pixel_size.width, "Got width %u, expected %u.\n", desc.Width, pixel_size.width); ok_(__FILE__, line)(desc.Height == pixel_size.height, "Got height %u, expected %u.\n", @@ -6889,6 +6891,25 @@ static void check_rt_bitmap_surface_(unsigned int line, ID2D1RenderTarget *rt, B ID2D1Bitmap_Release(bitmap); + /* Zero sized bitmaps. */ + set_size_u(&size, 0, 0); + hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + check_bitmap_surface_(line, bitmap, has_surface, options); + ID2D1Bitmap_Release(bitmap); + + set_size_u(&size, 2, 0); + hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + check_bitmap_surface_(line, bitmap, has_surface, options); + ID2D1Bitmap_Release(bitmap); + + set_size_u(&size, 0, 2); + hr = ID2D1RenderTarget_CreateBitmap(rt, size, NULL, 0, &bitmap_desc, &bitmap); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + check_bitmap_surface_(line, bitmap, has_surface, options); + ID2D1Bitmap_Release(bitmap); + /* WIC bitmap. */ CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);

1 0

Nikolay Sivov : d2d1: Implement d2d_device_context_ID2D1DeviceContext_CreateBitmap().
by Alexandre Julliard 02 Oct '18

02 Oct '18

Module: wine Branch: master Commit: 9775ed22aab46b061d3a6366d2d456a80aedb177 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9775ed22aab46b061d3a6366… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 29 02:50:03 2018 +0330 d2d1: Implement d2d_device_context_ID2D1DeviceContext_CreateBitmap(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index be31eca..d1c1845 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1783,10 +1783,17 @@ static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateBit D2D1_SIZE_U size, const void *src_data, UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, ID2D1Bitmap1 **bitmap) { - FIXME("iface %p, size {%u, %u}, src_data %p, pitch %u, desc %p, bitmap %p stub!\n", + struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); + struct d2d_bitmap *object; + HRESULT hr; + + TRACE("iface %p, size {%u, %u}, src_data %p, pitch %u, desc %p, bitmap %p.\n", iface, size.width, size.height, src_data, pitch, desc, bitmap); - return E_NOTIMPL; + if (SUCCEEDED(hr = d2d_bitmap_create(context, size, src_data, pitch, desc, &object))) + *bitmap = &object->ID2D1Bitmap1_iface; + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_CreateBitmapFromWicBitmap(

1 0

Nikolay Sivov : d2d1/tests: Add some tests for compatible target size handling.
by Alexandre Julliard 02 Oct '18

02 Oct '18

Module: wine Branch: master Commit: 1987c1fba4f5d23a79c75b15a3b4f06b1eaaecba URL: https://source.winehq.org/git/wine.git/?a=commit;h=1987c1fba4f5d23a79c75b15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 29 02:50:02 2018 +0330 d2d1/tests: Add some tests for compatible target size handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 166 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 149 insertions(+), 17 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1987c1fba4f5d23a79c7…

1 0

Józef Kucia : vkd3d: Do not enable shaderTessellationAndGeometryPointSize feature.
by Alexandre Julliard 02 Oct '18

02 Oct '18

Module: vkd3d Branch: master Commit: f7bb28dc2b8f0c0a30c327facddba6d65e9c5891 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f7bb28dc2b8f0c0a30c327f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 1 13:57:13 2018 +0200 vkd3d: Do not enable shaderTessellationAndGeometryPointSize feature. We don't want to write PointSize in tessellation and geometry shaders. 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> --- libs/vkd3d/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 673c54a..f91c0d9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1015,6 +1015,8 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, && FAILED(hr = vkd3d_select_physical_device(device->vkd3d_instance, &physical_device))) return hr; + device->vk_physical_device = physical_device; + /* Create command queues */ VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &queue_family_count, NULL)); if (!(queue_properties = vkd3d_calloc(queue_family_count, sizeof(*queue_properties)))) @@ -1083,10 +1085,11 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VK_CALL(vkGetPhysicalDeviceMemoryProperties(physical_device, &device->memory_properties)); VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &device_features)); - device->vk_physical_device = physical_device; if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &device_features, &extension_count))) goto done; + device_features.shaderTessellationAndGeometryPointSize = VK_FALSE; + if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { hr = E_OUTOFMEMORY;

1 0

Józef Kucia : tests: Fix unsupported formats tests on WARP.
by Alexandre Julliard 02 Oct '18

02 Oct '18

Module: vkd3d Branch: master Commit: 8995c681d56eab59900df1ebf7ff6fc6c59d59bc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8995c681d56eab59900df1e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 1 13:57:12 2018 +0200 tests: Fix unsupported formats tests on WARP. A recent version of WARP supports B8G8R8A8 UAVs even on D3D_FEATURE_LEVEL_11_0. 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> --- include/private/vkd3d_test.h | 6 ++++++ tests/d3d12.c | 39 ++++++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index 8e657ac..fd3ed15 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -90,6 +90,12 @@ vkd3d_test_platform_is_windows(void) return !strcmp(vkd3d_test_platform, "windows"); } +static inline bool +broken(bool condition) +{ + return condition && vkd3d_test_platform_is_windows(); +} + static void vkd3d_test_check_ok(unsigned int line, bool result, const char *fmt, va_list args) { diff --git a/tests/d3d12.c b/tests/d3d12.c index cff4397..dd842bc 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -869,6 +869,11 @@ static ID3D12Device *create_device(void) return device; } +static bool broken_on_warp(bool condition) +{ + return broken(use_warp_device && condition); +} + static bool is_min_max_filtering_supported(ID3D12Device *device) { D3D12_FEATURE_DATA_D3D12_OPTIONS options; @@ -1307,12 +1312,18 @@ static void test_format_support(void) unsigned int i; HRESULT hr; - static const D3D12_FEATURE_DATA_FORMAT_SUPPORT unsupported_format_features[] = + static const struct { - {DXGI_FORMAT_B8G8R8A8_TYPELESS, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, - D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, - {DXGI_FORMAT_B8G8R8A8_UNORM, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, - D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, + D3D12_FEATURE_DATA_FORMAT_SUPPORT f; + bool broken; + } + unsupported_format_features[] = + { + /* A recent version of WARP suppots B8G8R8A8 UAVs even on D3D_FEATURE_LEVEL_11_0. */ + {{DXGI_FORMAT_B8G8R8A8_TYPELESS, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, + D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, true}, + {{DXGI_FORMAT_B8G8R8A8_UNORM, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, + D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, true}, }; if (!(device = create_device())) @@ -1333,16 +1344,18 @@ static void test_format_support(void) for (i = 0; i < ARRAY_SIZE(unsupported_format_features); ++i) { memset(&format_support, 0, sizeof(format_support)); - format_support.Format = unsupported_format_features[i].Format; + format_support.Format = unsupported_format_features[i].f.Format; hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_SUPPORT, &format_support, sizeof(format_support)); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(!(format_support.Support1 & unsupported_format_features[i].Support1), - "Format %#x supports %#x.\n", unsupported_format_features[i].Format, - format_support.Support1 & unsupported_format_features[i].Support1); - ok(!(format_support.Support2 & unsupported_format_features[i].Support2), - "Format %#x supports %#x.\n", unsupported_format_features[i].Format, - format_support.Support2 & unsupported_format_features[i].Support2); + ok(!(format_support.Support1 & unsupported_format_features[i].f.Support1) + || broken_on_warp(unsupported_format_features[i].broken), + "Format %#x supports %#x.\n", unsupported_format_features[i].f.Format, + format_support.Support1 & unsupported_format_features[i].f.Support1); + ok(!(format_support.Support2 & unsupported_format_features[i].f.Support2) + || broken_on_warp(unsupported_format_features[i].broken), + "Format %#x supports %#x.\n", unsupported_format_features[i].f.Format, + format_support.Support2 & unsupported_format_features[i].f.Support2); } refcount = ID3D12Device_Release(device); @@ -1709,7 +1722,7 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, NULL, &IID_ID3D12Resource, (void **)&resource); - todo(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + todo(hr == E_INVALIDARG || broken_on_warp(true), "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) ID3D12Resource_Release(resource);

1 0

Józef Kucia : tests: Add simple test for creating placed resources.
by Alexandre Julliard 02 Oct '18

02 Oct '18

Module: vkd3d Branch: master Commit: 4595f71afd03591da0937201fdacd7ebf003c0ee URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4595f71afd03591da093720… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 1 13:57:11 2018 +0200 tests: Add simple test for creating placed resources. 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> --- tests/d3d12.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index c7f4977..cff4397 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1921,6 +1921,92 @@ done: ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_create_placed_resource(void) +{ + D3D12_GPU_VIRTUAL_ADDRESS gpu_address; + D3D12_RESOURCE_DESC resource_desc; + ID3D12Device *device, *tmp_device; + D3D12_CLEAR_VALUE clear_value; + D3D12_HEAP_DESC heap_desc; + ID3D12Resource *resource; + ID3D12Heap *heap; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + heap_desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties)); + heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT; + heap_desc.Alignment = 0; + heap_desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS; + hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr); + + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + resource_desc.Alignment = 0; + resource_desc.Width = 32; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_UNKNOWN; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + resource_desc.Flags = 0; + + clear_value.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + clear_value.Color[0] = 1.0f; + clear_value.Color[1] = 0.0f; + clear_value.Color[2] = 0.0f; + clear_value.Color[3] = 1.0f; + + refcount = get_refcount(heap); + ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + hr = ID3D12Device_CreatePlacedResource(device, heap, 0, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, NULL, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create placed resource, hr %#x.\n", hr); + + refcount = get_refcount(heap); + ok(refcount == 1, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + refcount = get_refcount(device); + ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); + hr = ID3D12Resource_GetDevice(resource, &IID_ID3D12Device, (void **)&tmp_device); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); + refcount = get_refcount(device); + ok(refcount == 4, "Got unexpected refcount %u.\n", (unsigned int)refcount); + refcount = ID3D12Device_Release(tmp_device); + ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); + + check_interface(resource, &IID_ID3D12Object, TRUE); + check_interface(resource, &IID_ID3D12DeviceChild, TRUE); + check_interface(resource, &IID_ID3D12Pageable, TRUE); + check_interface(resource, &IID_ID3D12Resource, TRUE); + + gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource); + ok(gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); + + refcount = ID3D12Resource_Release(resource); + ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount); + + /* The clear value must be NULL for buffers. */ + hr = ID3D12Device_CreatePlacedResource(device, heap, 0, + &resource_desc, D3D12_RESOURCE_STATE_COMMON, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ID3D12Heap_Release(heap); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_create_descriptor_heap(void) { D3D12_DESCRIPTOR_HEAP_DESC heap_desc; @@ -20415,6 +20501,7 @@ START_TEST(d3d12) run_test(test_create_command_queue); run_test(test_create_committed_resource); run_test(test_create_heap); + run_test(test_create_placed_resource); run_test(test_create_descriptor_heap); run_test(test_create_sampler); run_test(test_create_unordered_access_view);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2018